Changes to part 1