CODE: Changes to mfind and ofind.