Update with Adam's comments (v1.1).