more changes based on the testing results