updated for hw6 part1