TP3 almost done