updated to work with latest OF API in master.