final part 2 changes