update for second code review