Added EC.
Merge branch 'ec'