XF 2.1 Upgrade?