started to modify the map code for demo