incorporated feedback from OWP team