Location Finder much better