modification after code review