Rejigged internal structure.