initial changes after feedback