Enhance TDI pull back and come down

Disclaimer