Updating SETUP to coinside with last pull request.