Minimap working
Merge conflict