Changed a few variable names, added doughnut chart data