Redesign

Merging changes for Redesign effort.