changes after second round of comments