Improved EC implementation

Up to an average of 1971.4!