Small changes in TP & SL generation