Loading of the final map
Map is working
Merge branch 'final-map'