Upgrade Vanilla to 2.1