Updating map
Integrating map and other stuffs