revamped master branch