working on map
merging