calculateEVEnergy was updated