Add part 9
Addition of part 8, missing changes