Reorganised failover return scripts 2