Incorporate PR feedback