final structure changes