optimisation for sf2.6