eid first draft
eid improvements