Refactorisation part 4