update for code review