Title: Improving Energy Demand Analysis