wip on draft: restructuration and evolutions ...