finished converting to lazyload