Updated for hw4 part 1