update for second code review II