Accounted for energyType shift