GROS REFACTOR