removed HW1 stuff from HW2