Massive revamp of the structure