Merging changes
Merge branch 'adjust-map'