Updated for HW4 Pt2