Changed Tasks to be fault tolerant