adding restart support