small changes in restore process to become more resilient