Changes to setup