Initial part 2 changes