integrated the code for setting address info