Reconfigured field_locations and field_location