Updated OPcheckout code