numerous changes in order to get china_unit_add to complete