Redesign attempt.