latest edits to merge into master