Made computing the average a tad better