Upgrades for sf2.1