Updated the main map to function differently ;