Matt's suggested changes.