got rid of lazy loading complications