further changes from testing