started with structure changes