rewrote OF utils