implement PR feedback