Updates due to review.
Update due to review