structure changes+++