Reorganized, tested EOR