Updating to latest Tortoise