updated changes to part 1 and part 2