some more structure changes