Fixed the classical calculator
Fixed the disaggregation calculator
Vectorized task_completed