Fixed HW7 Again