Again, more structure changes.