finished changes to stat
Merge branch 'some_work_on_stat'