Addressing review comments.