lazy loading changes