Fixed TP definitions