Changes from self-review