pull 307 code review changes