more code review after testing