Prepare for redesign