Upgrading Tamarin