Changing some of the setup