Part 7 redone