find_equiv signature changed