Updated for HW4
Updated for HW4