TP5 almost done