Improve stats again