Changed PO & SO mapping a little