Changes for homework part 2