Sami: adding geolocation code