upgraded code to support experimental version of EOL
modified default eol related behaviour