HW7 overhaul