trying to something slightly less horrible for location user experience