More tweaking during testing.