Timing updates.

Previous timing-values were not correctly updated.