Improved TP performance