Converted stats/graph fns to use generic helper