HW7 Modified