HW9 changes