hw3 part1 and 2 fixed