Completed MP2 Redesign

Completed MP2 Redesign