further structure changes