-failsafe moved again