Handle better timings