Implemented new failure system