made some structure changes