more structure changes