QC&TR changes

after firstset QC and TR