improved some timings