Incorporated structure changes from static changes