Reduce query count - we now do not call the same query over and over again.