Timing fluff removed