Changed routes to be based on city name and state abbreviation