Further structural changes