Addressing first round of review comments.