still working on map-upgrading