Changes for fault tolerance