Updated with static PO