made more fault tolerant