Merged 'redesign' branch