Scenario 2 completion and mass rearchitecture