switch to new design