edits to master.