Fail Safe and more

Fail Safe and more