Adding minimap
Merge