more structure changes.