Last modification before globale refactor.