fixed lazy loading bug
removed lazy loading