diff --git a/public/Source/App.js b/public/Source/App.js
index 8e4541d61cb4a8b2998a24030480e00736daf8ef..28b67765ee4e4eb91146be3ae5901e433c4cb440 100644
--- a/public/Source/App.js
+++ b/public/Source/App.js
@@ -169,12 +169,22 @@ function active3DTilePicker() {
             nameOverlay.style.display = 'block';
             nameOverlay.style.bottom = viewer.canvas.clientHeight - movement.endPosition.y + 'px';
             nameOverlay.style.left = movement.endPosition.x + 'px';
-            var name = picked3DtileFeature.getProperty('Type');
+            var name = picked3DtileFeature.getProperty('PolygonID');
+			var name2 = picked3DtileFeature.getProperty('Irr_kWh');
+			if (picked3DtileFeature.getProperty('Feature') === "Surface") {
 
             if (!Cesium.defined(name)) {
+                name = picked3DtileFeature.getProperty('PolygonID');
+            }
+            nameOverlay.textContent = name + ':' + ' ' + name2 + ' ' + 'kWh/(m².a)'; }
+			
+			else
+			{
+				if (!Cesium.defined(name)) {
                 name = picked3DtileFeature.getProperty('Type');
             }
-            nameOverlay.textContent = name;
+            nameOverlay.textContent = name ; }
+				
             // Highlight the feature if it's not already selected.
             if (picked3DtileFeature !== selected.feature) {
                 highlighted.feature = picked3DtileFeature;
diff --git a/public/Source/Data/Bldg/data/data0.b3dm b/public/Source/Data/Bldg/data/data0.b3dm
index fa6bf5ac8caf72f9c21f8b4cd730b03c790dbe26..d9a44e1c6187a966e234eb4b9322b5ab0ecc2c5f 100644
Binary files a/public/Source/Data/Bldg/data/data0.b3dm and b/public/Source/Data/Bldg/data/data0.b3dm differ
diff --git a/public/Source/Data/Srf/data/data0.b3dm b/public/Source/Data/Srf/data/data0.b3dm
index 438f03b8a575125e3ef60f4268b47b3ac60f4785..2cb66ad61e4ece3a1564e5e0a34b1b289d22e43c 100644
Binary files a/public/Source/Data/Srf/data/data0.b3dm and b/public/Source/Data/Srf/data/data0.b3dm differ