chnaged db structure
new map mobility