made some changes to add to master branch