Change settings

Working on merging two branches using a pull request