more change to structure