cleaning up the n+1 problems - still stuck