update for code review request #2