Some of the geolocalization sutff
Merged conflicts