changed lazy loading to normal... caused problems on completion