Dan edits
Merge branch 'Edits-21-May'