Changes to PO workflow