simplified master branch