#32 #33 code review2