Making restart work