diff --git a/Disp/HeidenhainCoordinateEntryDisplayee.cs b/Disp/HeidenhainCoordinateEntryDisplayee.cs
index 482c8ee..c8f353d 100644
--- a/Disp/HeidenhainCoordinateEntryDisplayee.cs
+++ b/Disp/HeidenhainCoordinateEntryDisplayee.cs
@@ -60,9 +60,9 @@ namespace Sample.Disp
                 return;
 
             ////Console.WriteLine($"B: {CoordinateIndex}; {coordinateMove}");
-            Vec3d mcXyz_AttacherAtTableMountZero = MillingEquipmentFunc?.Invoke()
-                ?.GetMachinePositionAtTableMountZero();
-            if (mcXyz_AttacherAtTableMountZero == null)
+            IMachiningEquipment equipment = MillingEquipmentFunc?.Invoke();
+            if (equipment == null
+                || !equipment.TryGetMachinePositionAtTableMountZero(out Vec3d mcXyz_AttacherAtTableMountZero))
                 return;
 
             Vec3d coordinateMove;
@@ -96,9 +96,9 @@ namespace Sample.Disp
             if (ncEnv == null || NcEnv.CncBrand != CncBrand.Heidenhain)
                 return;
 
-            Vec3d mcXyz_AttacherAtTableMountZero = MillingEquipmentFunc?.Invoke()
-                ?.GetMachinePositionAtTableMountZero();
-            if (mcXyz_AttacherAtTableMountZero == null)
+            IMachiningEquipment equipment = MillingEquipmentFunc?.Invoke();
+            if (equipment == null
+                || !equipment.TryGetMachinePositionAtTableMountZero(out Vec3d mcXyz_AttacherAtTableMountZero))
                 return;
             Vec3d coordinateMove;
             if (HeidenhainCycleDef247Q339 == 0 && HeidenhainCycleDef7Arg == null)
diff --git a/Disp/IsoCoordinateEntryDisplayee.cs b/Disp/IsoCoordinateEntryDisplayee.cs
index 0dbd8a7..e7e1ba0 100644
--- a/Disp/IsoCoordinateEntryDisplayee.cs
+++ b/Disp/IsoCoordinateEntryDisplayee.cs
@@ -45,19 +45,13 @@ public class IsoCoordinateEntryDisplayee : IAnchoredDisplayee
 		if (ncEnv == null)
 			return;
 
-		Vec3d coordinateMove;
-		string text;
-
-		if (ncEnv.IsoCoordinateTable?.TryGetValue(
-				IsoCoordinateId, out coordinateMove) != true
-			|| coordinateMove == null)
+		if (ncEnv.IsoCoordinateTable?.TryGetValue(IsoCoordinateId, out Vec3d coordinateMove) != true)
 			return;
-		if (coordinateMove == null)
-			return;
-		text = IsoCoordinateId ?? "";
+		string text = IsoCoordinateId ?? "";
 
-		Vec3d attacherPos = MillingEquipmentFunc?.Invoke()
-			?.GetIsoCoordinatePosition(coordinateMove);
+		IMachiningEquipment equipment = MillingEquipmentFunc?.Invoke();
+		if (equipment == null || !equipment.TryGetIsoCoordinatePosition(coordinateMove, out Vec3d attacherPos))
+			return;
 
 		bind.ModelMatStack.Push();
 		bind.ModelMatStack.Trans(attacherPos);
@@ -70,14 +64,11 @@ public class IsoCoordinateEntryDisplayee : IAnchoredDisplayee
 		HardNcEnv ncEnv = NcEnv;
 		if (ncEnv == null)
 			return;
-		Vec3d coordinateMove;
-		if (ncEnv.IsoCoordinateTable?.TryGetValue(IsoCoordinateId, out coordinateMove) != true
-			|| coordinateMove == null)
+		if (ncEnv.IsoCoordinateTable?.TryGetValue(IsoCoordinateId, out Vec3d coordinateMove) != true)
 			return;
 
-		Vec3d attacherPos = MillingEquipmentFunc?.Invoke()
-			?.GetIsoCoordinatePosition(coordinateMove);
-		if (attacherPos == null)
+		IMachiningEquipment equipment = MillingEquipmentFunc?.Invoke();
+		if (equipment == null || !equipment.TryGetIsoCoordinatePosition(coordinateMove, out Vec3d attacherPos))
 			return;
 		dst.Expand(attacherPos);
 	}