Update with suggestions from James's email