IW: Update PR based on feedback