changes from testing 6/30