combined changes from testing