Renamed 'city' to 'location' to cater for non-urban areas.