Changed energy handling