Added TP calculator with new API