Final changes for part 2