Fixed up for new invoice system