master branch edits