Work on better statistics