more code review for 840069