changed props and content structure