[Improve] geolocation - now with blocks