Feature/replace eot

as discussed in #154