After code review round 1