Simpler redesign.