M Douglas' email updated.
Merge conflict resolution.