Dean B edits
Incorporate Dean's edits