2.1 Redesign & Refine