Worked on map + scaling issue