New demo; repaired failure recovery