Improve TP form