Restructure part 6 (?)