Changes for part2 of hw