Switched back to energy first comparison in extended energies