latest changes to HW2