Part 1 of the final changes