Added conditional to timing.