redo some lazy loading