updates from testing