added changes after feedback