updated restart handling