Switch to new design at 5.1