Improve Timing Algo