Redesign: modifications