more stat
refactor