Code

Updated statistic generation