Added TP handling