Integrate N&V comments