finalizing structure changes