Reduce recovery times

We have an open Feature Request asking for better controls: