Overhaul of initial structure