Separated running totals, added defaults