Update to ELOCalculator