Settings file no longer works, added extra switch for safety