Update to HW8 and HW7