!UPSTREAM: Generalize eot

TODO:
- Move earlier in series