Overhaul of structure