updated: includes TP and FP calculation