Changes to HW1