ph2-p10 Code Review