IW: Update based on feedback