integrated the new changes