Integrated the new design