step 1 & 2 for classic PO entry support