Map is now functioning correctly