- More changes after RB's reviews.