GH310 - code review