Make more resillient to errors