removed lazy loading