Feat/redesign