Updates to HW1