Address comments from review.