HW4 Part2 modifications