modifications on EntropyCalculator