removed n+1 queries