stopped making a bajillion unnecessary db calls