and more testing... changed without note