Total on the billing now works, although not clean way