Preliminary changes for the redesign.