Added energy consumption stuff