HW4, part 1 changes done