Using legacy layout with embedded new parts