Changed metric to Demand and adjusted summation to include solar in this total demand