Fixed TD, TJ

TD: now sets TL
TJ: complies with spec