updated to work with latest OF 0074