added CityB and currentlocation