refactor equivComponents