Misc EIP logic added