Changed the way the setup is ran