Improve the way we evalate EL
2 files changed