Refactorisation part 3