added rm_city_state