Update based on review feedback.