Bringing failsafe up to date