Upgrade to SF2.2