restart improvements