Changes needed in statistics generator