Added better totals