Added handling for number of cities.