#resilience improvements