[WIP] Upgrade sf2.3