Adapted TR to changes in S/C.