updates based on first round of feedback