Up to part 8.4

Up to part 8.4.