addressed some of the oxr comments