TP5 done, fix for velocity