removed n+1 stuff