xtended FailSafe, some tuning