Preparations for major restructuring (a new method tbd)