Added better time computation and stats