Fixed up for new invoicing system