Upgrade to 2.2