Merge branches together again with fixed eth code.