HW5 FIXED