Same as previous commit without eV code from Martelli