even more resiliency changes