Updated Map grabbing..