Fault tolerance mostly working