More changes to setup