Update to HW6