3 files changed, 8 insertions, 4 deletions
diff --git a/scripts/rhizicore.js b/scripts/rhizicore.js
index d90daac9..670ed7bb 100644
--- a/scripts/rhizicore.js
+++ b/scripts/rhizicore.js
@@ -186,14 +186,16 @@ function myGraph(el) {
         }
     }
 
-    this.addLink = function(sourceId, targetId, name, state) {
+    this.addLink = function(sourceId, targetId, name, state, drop_conjugator_links) {
         sourceId = sourceId && sourceId.toLowerCase();
         targetId = targetId && targetId.toLowerCase();
         var sourceNode = findNode(sourceId, null);
         var targetNode = findNode(targetId, null);
         var found = findLink(sourceId,targetId,name);
-        
-        if(name)if(name.replace(/ /g,"")==="and")state="temp";
+
+        if (drop_conjugator_links && name && (name.replace(/ /g,"") === "and")) {
+            state = "temp";
+        }
         if(!found && ((sourceNode !== undefined) && (targetNode !== undefined))) {
             var link = {
                 "source": sourceNode,
diff --git a/scripts/textanalysis-ui.js b/scripts/textanalysis-ui.js
index 6d6e2f5a..2fab6c80 100644
--- a/scripts/textanalysis-ui.js
+++ b/scripts/textanalysis-ui.js
@@ -29,7 +29,7 @@ function analyzeSentence(sentence, finalize)
     }
     for (var k in ret.links) {
         var l = ret.links[k];
-        graph.addLink(l.sourceId, l.targetId, l.name, l.state);
+        graph.addLink(l.sourceId, l.targetId, l.name, l.state, ret.drop_conjugator_links);
     }
 
     //UPDATE GRAPH ONCE
diff --git a/scripts/textanalysis.js b/scripts/textanalysis.js
index dae85752..a3694887 100644
--- a/scripts/textanalysis.js
+++ b/scripts/textanalysis.js
@@ -256,6 +256,8 @@ function TextAnalyser2(newtext, finalize) {
         }
     }
 
+    ret.drop_conjugator_links = ANDcount < linkindex;
+
     //FOR THE EXTERNAL ARROW-TYPE CHANGER
     lastnode = newnodes[nodeindex];