Upgrading Avalon