Adjust implementation to "equiv"