Added Mode Finder