Incorporating comments from Barry, Richard, and Stephen.