Suite refacto;