#: rework of the structure using diagrams