Fixing a lot of the setup