StatisticalCalculator modified