incorporated PR feedback