added eyaml stuff