after feedback, more changes