Failsafes added