Making it more fault-tolerant