Updates to HW2