opr seems to be working nicely
reorganizing