Made restarting better