Added better statistics