Branch 4.2: Fixed the completion column to calculate all the tasks

instead of four