(Following) Changes from self-review