Updates to understanding the users location #374