finalized map changes
Merge branch 'map-test'