making some changes on the master branch