Part 1 changes