Updating to new setup