Incorporate PR remarks