improved termination timings