updated chart data pulling to work with new data scheme