some fault tolerance is been added