reducing some n + 1 issues