We have the same basic issue. We are a non-profit. We still process invoices. Please allow us to choose whether we use Pledge or Invoice EVERYWHERE, instead of superficially. it is confusing and not how we operate. We are slowly being forced to switch to this platform but we don't have the same control as we had in the past.