More updates based on review.