more changes for tpcw partial wise.