Updating setup script more