More changes per Jimmy's review.