branchbefore/main/stats_refactor_jan16cancel