make it more fault tolerant...