change after code review part 1