Added option to include sums