HW 5 fixed