added more of opr code.