Improve stats