- made structure changes