[DEPARTAMENTO] working on refactor