Switch to new design