some stats tab work
merge conflict