Add missing pieces for Part 8