a few mods for OF implementation