last changes for flash failover functionality