First round of addressing comments