Improved time measurement (for Will)