changed EI handling a bit and types