issue 8 code review after 2