pulled from original repo + ajout critères