structure changes and sruff