follow the new design