working on structure changes