polish restart / resume logic