map improvements
new map improvements
merged new-map