Restructure part 6