First stage in full redesign