code review, take2