Finished tweaking lazy loading