changes to support simplified invoices