More updates after review.