Part 1 and 2 changes