tp3 tp4 finished, tp5 added