Updated OF implementation