Adding HW7 changes