diff --git a/MeshtasticClient/Helpers/BLEManager.swift b/MeshtasticClient/Helpers/BLEManager.swift
index 76bf93ff..2d04564a 100644
--- a/MeshtasticClient/Helpers/BLEManager.swift
+++ b/MeshtasticClient/Helpers/BLEManager.swift
@@ -405,8 +405,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 						let myInfo = MyInfoEntity(context: context!)
 						myInfo.myNodeNum = Int64(decodedInfo.myInfo.myNodeNum)
 						myInfo.hasGps = decodedInfo.myInfo.hasGps_p
-						myInfo.channelUtilization = decodedInfo.myInfo.channelUtilization
-						
+
 						// Swift does strings weird, this does work to get the version without the github hash
 						let lastDotIndex = decodedInfo.myInfo.firmwareVersion.lastIndex(of: ".")
 						var version = decodedInfo.myInfo.firmwareVersion[...(lastDotIndex ?? String.Index(utf16Offset: 6, in: decodedInfo.myInfo.firmwareVersion))]
@@ -420,8 +419,6 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 						self.connectedPeripheral.num = myInfo.myNodeNum
 						self.connectedPeripheral.firmwareVersion = myInfo.firmwareVersion ?? "Unknown"
 						self.connectedPeripheral.name = myInfo.bleName ?? "Unknown"
-						self.connectedPeripheral.channelUtilization = myInfo.channelUtilization
-						self.connectedPeripheral.airTime = myInfo.airUtilTx
 						
 						let fetchBCUserRequest: NSFetchRequest<NSFetchRequestResult> = NSFetchRequest.init(entityName: "UserEntity")
 						fetchBCUserRequest.predicate = NSPredicate(format: "num == %lld", Int64(decodedInfo.myInfo.myNodeNum))
@@ -449,7 +446,6 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 
 						fetchedMyInfo[0].myNodeNum = Int64(decodedInfo.myInfo.myNodeNum)
 						fetchedMyInfo[0].hasGps = decodedInfo.myInfo.hasGps_p
-						fetchedMyInfo[0].channelUtilization = decodedInfo.myInfo.channelUtilization
 						let lastDotIndex = decodedInfo.myInfo.firmwareVersion.lastIndex(of: ".")//.lastIndex(of: ".", offsetBy: -1)
 						var version = decodedInfo.myInfo.firmwareVersion[...(lastDotIndex ?? String.Index(utf16Offset:6, in: decodedInfo.myInfo.firmwareVersion))]
 						version = version.dropLast()
@@ -461,9 +457,6 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 						self.connectedPeripheral.num = fetchedMyInfo[0].myNodeNum
 						self.connectedPeripheral.firmwareVersion = fetchedMyInfo[0].firmwareVersion ?? "Unknown"
 						self.connectedPeripheral.name = fetchedMyInfo[0].bleName ?? "Unknown"
-						self.connectedPeripheral.channelUtilization = fetchedMyInfo[0].channelUtilization
-						self.connectedPeripheral.airTime = fetchedMyInfo[0].airUtilTx
-						
 					}
 					do {
 
@@ -513,18 +506,19 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 						let newNode = NodeInfoEntity(context: context!)
 						newNode.id = Int64(decodedInfo.nodeInfo.num)
 						newNode.num = Int64(decodedInfo.nodeInfo.num)
+						
 						if decodedInfo.nodeInfo.hasDeviceMetrics {
+							
 							newNode.batteryLevel = Int32(decodedInfo.nodeInfo.deviceMetrics.batteryLevel)
 							newNode.voltage = decodedInfo.nodeInfo.deviceMetrics.voltage
+							newNode.channelUtilization = decodedInfo.nodeInfo.deviceMetrics.channelUtilization
+							self.connectedPeripheral.channelUtilization = newNode.channelUtilization
+							newNode.airUtilTx = decodedInfo.nodeInfo.deviceMetrics.airUtilTx
+							self.connectedPeripheral.airTime = decodedInfo.nodeInfo.deviceMetrics.airUtilTx
 						}
 						
-						
-						if decodedInfo.nodeInfo.lastHeard > 0 {
-							newNode.lastHeard = Date(timeIntervalSince1970: TimeInterval(Int64(decodedInfo.nodeInfo.lastHeard)))
-						}
-						else {
-							newNode.lastHeard = Date()
-						}
+						// FIXME: Date from the node info, may be a bad date, needs to be fixed upstream in the firmware
+						newNode.lastHeard = Date(timeIntervalSince1970: TimeInterval(Int64(decodedInfo.nodeInfo.lastHeard)))
 						newNode.snr = decodedInfo.nodeInfo.snr
 
 						if self.connectedPeripheral != nil && self.connectedPeripheral.num == newNode.num {
@@ -534,7 +528,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 								connectedPeripheral.name  = decodedInfo.nodeInfo.user.longName
 							}
 						}
-
+					
 						if decodedInfo.nodeInfo.hasUser {
 
 							let newUser = UserEntity(context: context!)
diff --git a/MeshtasticClient/Meshtastic.xcdatamodeld/MeshtasticDataModel v 3.xcdatamodel/contents b/MeshtasticClient/Meshtastic.xcdatamodeld/MeshtasticDataModel v 3.xcdatamodel/contents
index ae0f4abb..d476aa02 100644
--- a/MeshtasticClient/Meshtastic.xcdatamodeld/MeshtasticDataModel v 3.xcdatamodel/contents	
+++ b/MeshtasticClient/Meshtastic.xcdatamodeld/MeshtasticDataModel v 3.xcdatamodel/contents	
@@ -22,10 +22,8 @@
         </uniquenessConstraints>
     </entity>
     <entity name="MyInfoEntity" representedClassName="MyInfoEntity" syncable="YES" codeGenerationType="class">
-        <attribute name="airUtilTx" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="bitrate" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="bleName" optional="YES" attributeType="String"/>
-        <attribute name="channelUtilization" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="firmwareVersion" attributeType="String"/>
         <attribute name="hasGps" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="hasWifi" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
@@ -41,8 +39,10 @@
         </uniquenessConstraints>
     </entity>
     <entity name="NodeInfoEntity" representedClassName="NodeInfoEntity" syncable="YES" codeGenerationType="class">
+        <attribute name="airUtilTx" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="batteryLevel" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="bleName" optional="YES" attributeType="String"/>
+        <attribute name="channelUtilization" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="lastHeard" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="num" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
@@ -82,8 +82,8 @@
     </entity>
     <elements>
         <element name="MessageEntity" positionX="-36" positionY="63" width="128" height="215"/>
-        <element name="MyInfoEntity" positionX="-18" positionY="81" width="128" height="209"/>
-        <element name="NodeInfoEntity" positionX="-63" positionY="-18" width="128" height="179"/>
+        <element name="MyInfoEntity" positionX="-18" positionY="81" width="128" height="179"/>
+        <element name="NodeInfoEntity" positionX="-63" positionY="-18" width="128" height="209"/>
         <element name="PositionEntity" positionX="-54" positionY="54" width="128" height="119"/>
         <element name="UserEntity" positionX="0" positionY="144" width="128" height="200"/>
     </elements>