Addressing more comments.