changes to the overall structure