updated everything on the master branch