other changes after feedback