Refactorisation part 5