removed lazy loading for now