refactored w/ change in city ruler