Changes to part 2