MUCH improved auto restart