Redesign, step 2