Continuation du refacto