Big update of statistics part'