Updated the setup script