Follow the new design