Updated for HW3
Updated for HW3