code review - 6/19