Updated per CR review.