and yet some more EL changes