New version of ostf

Not tested