Solution is based on cities now