HW3 changes
HW4 changes