Work in progress for failure recovery.