Update to timing logic