Major structural overhaul