small optimization
Structurechange