some structure- changes