Before we try a crazy redesign...