some changes, broke tests with lazy loading