removed changes that were unnecessary; bugfix to OPR
turned opr, XH2 into properties