Map + loading updated
Merge branch 'Loading' into Logic
Rundabout solved