Adapted to changes in TR and S/C.