merged changes from testing