More work on invoicing