Map almost functioning correctly