ostf integration

ostf is broken here, but at least it should not affect other features.