Redesign initial commit