Changes to setup and requirements