integrated the new map-manager