Added early EH searching code
Added early EH searching code