Updated to latest EC class file