Reorganised failover return scripts