Changed to use new find modules.