diff --git a/MeshtasticClient/Meshtastic.xcdatamodeld/MeshtasticDataModel v 3.xcdatamodel/contents b/MeshtasticClient/Meshtastic.xcdatamodeld/MeshtasticDataModel v 3.xcdatamodel/contents
index 55b039d0..6205af2a 100644
--- a/MeshtasticClient/Meshtastic.xcdatamodeld/MeshtasticDataModel v 3.xcdatamodel/contents	
+++ b/MeshtasticClient/Meshtastic.xcdatamodeld/MeshtasticDataModel v 3.xcdatamodel/contents	
@@ -50,7 +50,7 @@
         <attribute name="voltage" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <relationship name="myInfo" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MyInfoEntity" inverseName="myInfoNode" inverseEntity="MyInfoEntity"/>
         <relationship name="positions" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="PositionEntity" inverseName="nodePosition" inverseEntity="PositionEntity"/>
-        <relationship name="telemetry" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="TelemetryEntity"/>
+        <relationship name="telemetries" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="TelemetryEntity" inverseName="nodeTelemetry" inverseEntity="TelemetryEntity"/>
         <relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="UserEntity" inverseName="userNode" inverseEntity="UserEntity"/>
         <uniquenessConstraints>
             <uniquenessConstraint>
@@ -75,7 +75,7 @@
         <attribute name="temperature" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="time" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="voltage" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <relationship name="nodeTelemetry" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TelemetryEntity"/>
+        <relationship name="nodeTelemetry" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="telemetries" inverseEntity="NodeInfoEntity"/>
     </entity>
     <entity name="UserEntity" representedClassName="UserEntity" syncable="YES" codeGenerationType="class">
         <attribute name="hwModel" attributeType="String"/>
@@ -95,9 +95,9 @@
     <elements>
         <element name="MessageEntity" positionX="-36" positionY="63" width="128" height="215"/>
         <element name="MyInfoEntity" positionX="-18" positionY="81" width="128" height="179"/>
-        <element name="NodeInfoEntity" positionX="-63" positionY="-18" width="128" height="209"/>
+        <element name="NodeInfoEntity" positionX="-63" positionY="-18" width="128" height="14"/>
         <element name="PositionEntity" positionX="-54" positionY="54" width="128" height="119"/>
-        <element name="TelemetryEntity" positionX="160" positionY="192" width="128" height="164"/>
+        <element name="TelemetryEntity" positionX="160" positionY="192" width="128" height="14"/>
         <element name="UserEntity" positionX="0" positionY="144" width="128" height="200"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/MeshtasticClient/Protobufs/radioconfig.pb.swift b/MeshtasticClient/Protobufs/radioconfig.pb.swift
index 783a964f..895a8c90 100644
--- a/MeshtasticClient/Protobufs/radioconfig.pb.swift
+++ b/MeshtasticClient/Protobufs/radioconfig.pb.swift
@@ -732,15 +732,6 @@ struct RadioConfig {
       set {_uniqueStorage()._phoneTimeoutSecs = newValue}
     }
 
-    ///
-    /// Power management state machine option.
-    /// See [power management](/docs/software/other/power) for details.
-    /// 0 for default of two hours, MAXUINT for disabled
-    var phoneSdsTimeoutSec: UInt32 {
-      get {return _storage._phoneSdsTimeoutSec}
-      set {_uniqueStorage()._phoneSdsTimeoutSec = newValue}
-    }
-
     ///
     /// Power management state machine option.
     /// See [power management](/docs/software/other/power) for details.
@@ -1737,7 +1728,6 @@ extension RadioConfig.UserPreferences: SwiftProtobuf.Message, SwiftProtobuf._Mes
     4: .standard(proto: "wait_bluetooth_secs"),
     5: .standard(proto: "screen_on_secs"),
     6: .standard(proto: "phone_timeout_secs"),
-    7: .standard(proto: "phone_sds_timeout_sec"),
     8: .standard(proto: "mesh_sds_timeout_secs"),
     9: .standard(proto: "sds_secs"),
     10: .standard(proto: "ls_secs"),
@@ -1824,7 +1814,6 @@ extension RadioConfig.UserPreferences: SwiftProtobuf.Message, SwiftProtobuf._Mes
     var _waitBluetoothSecs: UInt32 = 0
     var _screenOnSecs: UInt32 = 0
     var _phoneTimeoutSecs: UInt32 = 0
-    var _phoneSdsTimeoutSec: UInt32 = 0
     var _meshSdsTimeoutSecs: UInt32 = 0
     var _sdsSecs: UInt32 = 0
     var _lsSecs: UInt32 = 0
@@ -1914,7 +1903,6 @@ extension RadioConfig.UserPreferences: SwiftProtobuf.Message, SwiftProtobuf._Mes
       _waitBluetoothSecs = source._waitBluetoothSecs
       _screenOnSecs = source._screenOnSecs
       _phoneTimeoutSecs = source._phoneTimeoutSecs
-      _phoneSdsTimeoutSec = source._phoneSdsTimeoutSec
       _meshSdsTimeoutSecs = source._meshSdsTimeoutSecs
       _sdsSecs = source._sdsSecs
       _lsSecs = source._lsSecs
@@ -2015,7 +2003,6 @@ extension RadioConfig.UserPreferences: SwiftProtobuf.Message, SwiftProtobuf._Mes
         case 4: try { try decoder.decodeSingularUInt32Field(value: &_storage._waitBluetoothSecs) }()
         case 5: try { try decoder.decodeSingularUInt32Field(value: &_storage._screenOnSecs) }()
         case 6: try { try decoder.decodeSingularUInt32Field(value: &_storage._phoneTimeoutSecs) }()
-        case 7: try { try decoder.decodeSingularUInt32Field(value: &_storage._phoneSdsTimeoutSec) }()
         case 8: try { try decoder.decodeSingularUInt32Field(value: &_storage._meshSdsTimeoutSecs) }()
         case 9: try { try decoder.decodeSingularUInt32Field(value: &_storage._sdsSecs) }()
         case 10: try { try decoder.decodeSingularUInt32Field(value: &_storage._lsSecs) }()
@@ -2115,9 +2102,6 @@ extension RadioConfig.UserPreferences: SwiftProtobuf.Message, SwiftProtobuf._Mes
       if _storage._phoneTimeoutSecs != 0 {
         try visitor.visitSingularUInt32Field(value: _storage._phoneTimeoutSecs, fieldNumber: 6)
       }
-      if _storage._phoneSdsTimeoutSec != 0 {
-        try visitor.visitSingularUInt32Field(value: _storage._phoneSdsTimeoutSec, fieldNumber: 7)
-      }
       if _storage._meshSdsTimeoutSecs != 0 {
         try visitor.visitSingularUInt32Field(value: _storage._meshSdsTimeoutSecs, fieldNumber: 8)
       }
@@ -2369,7 +2353,6 @@ extension RadioConfig.UserPreferences: SwiftProtobuf.Message, SwiftProtobuf._Mes
         if _storage._waitBluetoothSecs != rhs_storage._waitBluetoothSecs {return false}
         if _storage._screenOnSecs != rhs_storage._screenOnSecs {return false}
         if _storage._phoneTimeoutSecs != rhs_storage._phoneTimeoutSecs {return false}
-        if _storage._phoneSdsTimeoutSec != rhs_storage._phoneSdsTimeoutSec {return false}
         if _storage._meshSdsTimeoutSecs != rhs_storage._meshSdsTimeoutSecs {return false}
         if _storage._sdsSecs != rhs_storage._sdsSecs {return false}
         if _storage._lsSecs != rhs_storage._lsSecs {return false}