Simplified and fixed timings.