suggested changes from osr