Moved around methods in city.*pp