TP8 almost done