diff --git a/src/renderer/components/EditLayer.vue b/src/renderer/components/EditLayer.vue
index 324880c..fcc0ad9 100644
--- a/src/renderer/components/EditLayer.vue
+++ b/src/renderer/components/EditLayer.vue
@@ -724,6 +724,7 @@ You should have received a copy of the GNU General Public License along with FG
                   iconAnchor: [15, 42]
               });
 
+              element['holdPointType'] =  this.$store.state.Editable.data.node.holdPointType;
               element.setIcon(icon);
             }
             hasHoldPointNode = true;
@@ -787,6 +788,7 @@ You should have received a copy of the GNU General Public License along with FG
           node.addTo(this.groundnetLayerGroup);
           node.featureLookup = this.featureLookup;
           this.featureLookup[nIndex].push(node);
+          node['holdPointType'] =  this.$store.state.Editable.data.node.holdPointType;
           node.addListeners();
           node.extensions();
         }
diff --git a/src/renderer/utils/check.js b/src/renderer/utils/check.js
index 737ce0a..7b20662 100644
--- a/src/renderer/utils/check.js
+++ b/src/renderer/utils/check.js
@@ -104,7 +104,7 @@ async function checkGroundnet(data) {
             pushbackNodes.forEach(element => {
                 noPushbackGraph[element] = {};
             });
-            edges.forEach(element => {
+            edges.filter(element => element.isPushBackRoute).forEach(element => {
                 noPushbackGraph[element.start] = {};
                 noPushbackGraph[element.end] = {};
             });
@@ -141,6 +141,20 @@ async function checkGroundnet(data) {
                     this.postMessage(['progress', 1]);
                 });
             });
+            var rogueHoldPoints = pushbackNodes.map(
+
+                //multiplePushbackRoutes.push();
+
+                id => { 
+                    var routes = noPushbackGraph[id];
+                    if(Object.keys(routes).length<1)
+                      return { id: id, message: 'Unconnected Pushbacknode' } 
+                    /*
+                    else if(Object.keys(routes).length>1)
+                      return { id: id, message: 'Multiple connected pushback node' }
+                    */
+                }
+            ).filter(n => n !== undefined);
             var wrongPushbackRoutes = parkings.filter(
                 function (e) {
                     //debugger;
@@ -243,10 +257,11 @@ async function checkGroundnet(data) {
             if (danglingEnds.length===0) {
                 notOkNodes.push({id:-1, message: 'No invalid ends'});
             }
-            notOkNodes = notOkNodes.concat(notOkNodesParkings);
-            if (notOkNodesParkings.length===0) {
+            notOkNodes = notOkNodes.concat(notOkNodesParkings).concat(rogueHoldPoints);
+            if (notOkNodesParkings.length===0 && rogueHoldPoints===0) {
                 notOkNodes.push({id:-1, message: 'Routes from parkings OK'});
             }
+            
             notOkNodes = notOkNodes.concat(notOkNodesRunways);
             if (notOkNodesRunways.length===0) {
                 notOkNodes.push({id:-1, message: 'Routes from runways OK'});
@@ -302,15 +317,14 @@ function check2(params) {
 }
 
 var mapPushbackNodes = function (o) {
-    if (o.type === 'PushBack')
+    if (o.type === 'PushBack') {
         return o.index;
-    console.log(o);
+    }
 }
 
 var mapParkings = function (o) {
     if (o.type === 'parking')
         return o.index;
-    console.log(o);
 }
 
 var mapParkingNode = function (o) {