Changes for HW4 part1