Extend EI Temporary Rules & Fix EI for Good