patch up to master branch edits