HW 7 and HW 6 Updates