updated to work with OF latest master.