Updated the setup