[WIP] work in progress - refactorisation
[WIP] work in progress - refactorisation