Changes per PG review.