Improve ecm

Improve ecm according to #104