More structure changes.