added more lazy loading