HW2 fixed
HW3 fixed