Add better timming mechanism.