initial changes to work with EL