update for second code review III