dding last TP + almost done (problem with distance)