Redesign the whole thing