slowly tweaking the map
Resolved merge