All changes for Safety and Fail Safes