diff --git a/src/arachne.c b/src/arachne.c
index c155d13..4052551 100644
--- a/src/arachne.c
+++ b/src/arachne.c
@@ -34,6 +34,7 @@
 #include "switches.h"
 #include "specialterm.h"
 #include "cost.h"
+#include "dotout.h"
 
 extern int *graph;
 extern int nodes;
@@ -1536,377 +1537,6 @@ latexSemiState ()
   eprintf ("\\nextlevel\n\\end{msc}\n\n");
 }
 
-//! Display the current semistate using dot output format.
-/**
- * This is not as nice as we would like it. Furthermore, the function is too big, and needs to be split into functional parts that
- * will allow the generation of LaTeX code as well.
- */
-void
-dotSemiState ()
-{
-  static int attack_number = 0;
-  int run;
-  Protocol p;
-  int *ranks;
-  int maxrank;
-
-  void node (const int run, const int index)
-  {
-    if (sys->runs[run].protocol == INTRUDER)
-      {
-	if (sys->runs[run].role == I_M)
-	  {
-	    eprintf ("m0");
-	  }
-	else
-	  {
-	    eprintf ("i%i", run);
-	  }
-      }
-    else
-      {
-	eprintf ("r%ii%i", run, index);
-      }
-  }
-
-  // Open graph
-  attack_number++;
-  eprintf ("digraph semiState%i {\n", attack_number);
-  eprintf ("\tlabel = \"[Id %i] Protocol ", sys->attackid);
-  p = (Protocol) sys->current_claim->protocol;
-  termPrint (p->nameterm);
-  eprintf (", role ");
-  termPrint (sys->current_claim->rolename);
-  eprintf (", claim type ");
-  termPrint (sys->current_claim->type);
-  eprintf ("\";\n");
-
-  // Needed for the bindings later on: create graph
-  goal_graph_create ();		// create graph
-  if (warshall (graph, nodes) == 0)	// determine closure
-    {
-      eprintf
-	("// This graph was not completely closed transitively because it contains a cycle!\n");
-    }
-
-  ranks = memAlloc (nodes * sizeof (int));
-  maxrank = graph_ranks (graph, ranks, nodes);	// determine ranks
-
-#ifdef DEBUG
-  // For debugging purposes, we also display an ASCII version of some stuff in the comments
-  printSemiState ();
-  // Even draw all dependencies for non-intruder runs
-  // Real nice debugging :(
-  {
-    int run;
-
-    run = 0;
-    while (run < sys->maxruns)
-      {
-	int ev;
-
-	ev = 0;
-	while (ev < sys->runs[run].length)
-	  {
-	    int run2;
-	    int notfirstrun;
-
-	    eprintf ("// precedence: r%ii%i <- ", run, ev);
-	    run2 = 0;
-	    notfirstrun = 0;
-	    while (run2 < sys->maxruns)
-	      {
-		int notfirstev;
-		int ev2;
-
-		notfirstev = 0;
-		ev2 = 0;
-		while (ev2 < sys->runs[run2].length)
-		  {
-		    if (graph[graph_nodes (nodes, run2, ev2, run, ev)] != 0)
-		      {
-			if (notfirstev)
-			  eprintf (",");
-			else
-			  {
-			    if (notfirstrun)
-			      eprintf (" ");
-			    eprintf ("r%i:", run2);
-			  }
-			eprintf ("%i", ev2);
-			notfirstrun = 1;
-			notfirstev = 1;
-		      }
-		    ev2++;
-		  }
-		run2++;
-	      }
-	    eprintf ("\n");
-	    ev++;
-	  }
-	run++;
-      }
-  }
-#endif
-
-  // Draw graph
-  // First, all simple runs
-  run = 0;
-  while (run < sys->maxruns)
-    {
-      Roledef rd;
-      int index;
-
-      index = 0;
-      rd = sys->runs[run].start;
-      if (sys->runs[run].protocol != INTRUDER && sys->runs[run].length > 0)
-	{
-	  // Regular run
-
-	  /* DISABLED subgraphs
-	     eprintf ("\tsubgraph cluster_run%i {\n", run);
-	     eprintf ("\t\tlabel = \"");
-	     eprintf ("#%i: ", run);
-	     termPrint (sys->runs[run].protocol->nameterm);
-	     eprintf (", ");
-	     agentsOfRunPrint (sys, run);
-	     eprintf ("\";\n", run);
-	     if (run == 0)
-	     {
-	     eprintf ("\t\tcolor = red;\n");
-	     }
-	     else
-	     {
-	     eprintf ("\t\tcolor = blue;\n");
-	     }
-	   */
-
-
-	  // Display the respective events
-	  while (index < sys->runs[run].length)
-	    {
-	      // Print node itself
-	      eprintf ("\t\t");
-	      node (run, index);
-	      eprintf (" [");
-	      if (run == 0 && index == sys->current_claim->ev)
-		{
-		  eprintf
-		    ("style=filled,fillcolor=mistyrose,color=salmon,shape=doubleoctagon,");
-		}
-	      else
-		{
-		  eprintf ("shape=box,");
-		}
-	      eprintf ("label=\"");
-	      roledefPrintShort (rd);
-	      eprintf ("\"]");
-	      eprintf (";\n");
-
-	      // Print binding to previous node
-	      if (index > sys->runs[run].firstReal)
-		{
-		  // index > 0
-		  eprintf ("\t\t");
-		  node (run, index - 1);
-		  eprintf (" -> ");
-		  node (run, index);
-		  eprintf (" [style=\"bold\", weight=\"10.0\"]");
-		  eprintf (";\n");
-		}
-	      else
-		{
-		  // index <= firstReal
-		  if (index == sys->runs[run].firstReal)
-		    {
-		      // index == firstReal
-		      Roledef rd;
-		      int send_before_read;
-		      int done;
-
-		      // Determine if it is an active role or note
-		      /**
-		       *@todo note that this will probably become a standard function call for role.h
-		       */
-		      rd =
-			roledef_shift (sys->runs[run].start,
-				       sys->runs[run].firstReal);
-		      done = 0;
-		      send_before_read = 0;
-		      while (!done && rd != NULL)
-			{
-			  if (rd->type == READ)
-			    {
-			      done = 1;
-			    }
-			  if (rd->type == SEND)
-			    {
-			      done = 1;
-			      send_before_read = 1;
-			    }
-			  rd = rd->next;
-			}
-		      // Draw the first box
-		      // This used to be drawn only if done && send_before_read, now we always draw it.
-		      eprintf ("\t\ts%i [label=\"Run %i: ", run, run);
-		      termPrint (sys->runs[run].protocol->nameterm);
-		      eprintf (", ");
-		      termPrint (sys->runs[run].role->nameterm);
-		      eprintf ("\\n");
-		      agentsOfRunPrint (sys, run);
-		      eprintf ("\", shape=diamond];\n");
-		      eprintf ("\t\ts%i -> ", run);
-		      node (run, index);
-		      eprintf (";\n");
-		    }
-		}
-	      index++;
-	      rd = rd->next;
-	    }
-	  /* DISABLED subgraphs
-	     eprintf ("\t}\n");
-	   */
-	}
-      run++;
-    }
-
-  // Second, all bindings.
-  // We now determine them ourselves between existing runs
-  run = 0;
-  while (run < sys->maxruns)
-    {
-      if (sys->runs[run].protocol != INTRUDER)
-	{
-	  int ev;
-
-	  ev = 0;
-	  while (ev < sys->runs[run].length)
-	    {
-	      void incoming_arrow (int run2, int ev2)
-	      {
-		Roledef rd, rd2;
-		/*
-		 * We have decided to draw this binding,
-		 * from run2,ev2 to run,ev
-		 * However, me might need to decide some colouring for this node.
-		 */
-		eprintf ("\t");
-		node (run2, ev2);
-		eprintf (" -> ");
-		node (run, ev);
-		eprintf (" ");
-		// decide color
-		rd = roledef_shift (sys->runs[run].start, ev);
-		rd2 = roledef_shift (sys->runs[run2].start, ev2);
-		if (rd->type == CLAIM)
-		  {
-		    // Towards a claim, so only indirect dependency
-		    eprintf ("[color=cornflowerblue]");
-		  }
-		else
-		  {
-		    // Not towards claim should imply towards read,
-		    // but we check it to comply with future stuff.
-		    if (rd->type == READ && rd2->type == SEND)
-		      {
-			// We want to distinguish where it is from a 'broken' send
-			if (isTermEqual (rd->message, rd2->message))
-			  {
-			    if (isTermEqual
-				(rd->from, rd2->from)
-				&& isTermEqual (rd->to, rd2->to))
-			      {
-				// Wow, a perfect match. Leave the arrow as-is :)
-				eprintf ("[color=forestgreen]");
-			      }
-			    else
-			      {
-				// Same message, different people
-				eprintf
-				  ("[label=\"redirect\",color=darkorange2]");
-			      }
-			  }
-			else
-			  {
-			    // Not even the same message, intruder construction
-			    eprintf ("[label=\"construct\",color=red]");
-			  }
-		      }
-		  }
-		// close up
-		eprintf (";\n");
-	      }
-
-	      iterate_incoming_arrows (incoming_arrow, run, ev);
-
-	      ev++;
-	    }
-	}
-      run++;
-    }
-
-  // Third, all ranking info
-  {
-    int myrank;
-
-#ifdef DEBUG
-    {
-      int n;
-
-      eprintf ("/* ranks: %i\n", maxrank);
-      n = 0;
-      while (n < nodes)
-	{
-	  eprintf ("%i ", ranks[n]);
-	  n++;
-	}
-      eprintf ("\n*/\n\n");
-    }
-#endif
-    myrank = 0;
-    while (myrank < maxrank)
-      {
-	int count;
-	int run;
-	int run1;
-	int ev1;
-
-	count = 0;
-	run = 0;
-	while (run < sys->maxruns)
-	  {
-	    if (sys->runs[run].protocol != INTRUDER)
-	      {
-		int ev;
-
-		ev = 0;
-		while (ev < sys->runs[run].step)
-		  {
-		    if (myrank == ranks[node_number (run, ev)])
-		      {
-			if (count == 0)
-			  eprintf ("\t{ rank = same; ");
-			count++;
-			eprintf ("r%ii%i; ", run, ev);
-		      }
-		    ev++;
-		  }
-	      }
-	    run++;
-	  }
-	if (count > 0)
-	  eprintf ("}\t\t// rank %i\n", myrank);
-	myrank++;
-      }
-  }
-
-  // clean memory
-  memFree (ranks, nodes * sizeof (int));	// ranks
-
-  // close graph
-  eprintf ("};\n\n");
-}
-
 //! Print the current semistate
 void
 printSemiState ()
@@ -3577,7 +3207,7 @@ arachneOutputAttack ()
 	}
       else
 	{
-	  dotSemiState ();
+	  dotSemiState (sys);
 	}
     }
 
diff --git a/src/arachne.h b/src/arachne.h
index e45e2c3..ff5c29c 100644
--- a/src/arachne.h
+++ b/src/arachne.h
@@ -12,5 +12,8 @@ int isTriviallyKnownAtArachne (const System sys, const Term t, const int run,
 			       const int index);
 int isTriviallyKnownAfterArachne (const System sys, const Term t,
 				  const int run, const int index);
+int ranks_to_lines (int *ranks, const int nodes);
+void iterate_incoming_arrows (void (*func) (), const int run, const int ev);
+void iterate_outgoing_arrows (void (*func) (), const int run, const int ev);
 
 #endif
diff --git a/src/dotout.c b/src/dotout.c
new file mode 100644
index 0000000..7cc78d8
--- /dev/null
+++ b/src/dotout.c
@@ -0,0 +1,416 @@
+#include "system.h"
+#include "switches.h"
+#include "memory.h"
+#include "arachne.h"
+
+extern int *graph;
+extern int nodes;
+extern int graph_uordblks;
+
+extern Protocol INTRUDER;		// Pointers, to be set by the Init of arachne.c
+extern Role I_M;			// Same here.
+extern Role I_RRS;
+extern Role I_RRSD;
+
+#define INVALID		-1
+#define isGoal(rd)	(rd->type == READ && !rd->internal)
+#define isBound(rd)	(rd->bound)
+#define length		step
+
+//! Display the current semistate using dot output format.
+/**
+ * This is not as nice as we would like it. Furthermore, the function is too big, and needs to be split into functional parts that
+ * will allow the generation of LaTeX code as well.
+ */
+void
+dotSemiState (const System sys)
+{
+  static int attack_number = 0;
+  int run;
+  Protocol p;
+  int *ranks;
+  int maxrank;
+  int from_intruder_count;
+
+  void node (const int run, const int index)
+  {
+    if (sys->runs[run].protocol == INTRUDER)
+      {
+	if (sys->runs[run].role == I_M)
+	  {
+	    eprintf ("m0");
+	  }
+	else
+	  {
+	    eprintf ("i%i", run);
+	  }
+      }
+    else
+      {
+	eprintf ("r%ii%i", run, index);
+      }
+  }
+
+  // Open graph
+  attack_number++;
+  eprintf ("digraph semiState%i {\n", attack_number);
+  eprintf ("\tlabel = \"[Id %i] Protocol ", sys->attackid);
+  p = (Protocol) sys->current_claim->protocol;
+  termPrint (p->nameterm);
+  eprintf (", role ");
+  termPrint (sys->current_claim->rolename);
+  eprintf (", claim type ");
+  termPrint (sys->current_claim->type);
+  eprintf ("\";\n");
+
+  from_intruder_count = 0;		// number of terms that can come from the initial knowledge
+
+  // Needed for the bindings later on: create graph
+  goal_graph_create ();		// create graph
+  if (warshall (graph, nodes) == 0)	// determine closure
+    {
+      eprintf
+	("// This graph was not completely closed transitively because it contains a cycle!\n");
+    }
+
+  ranks = memAlloc (nodes * sizeof (int));
+  maxrank = graph_ranks (graph, ranks, nodes);	// determine ranks
+
+#ifdef DEBUG
+  // For debugging purposes, we also display an ASCII version of some stuff in the comments
+  printSemiState ();
+  // Even draw all dependencies for non-intruder runs
+  // Real nice debugging :(
+  {
+    int run;
+
+    run = 0;
+    while (run < sys->maxruns)
+      {
+	int ev;
+
+	ev = 0;
+	while (ev < sys->runs[run].length)
+	  {
+	    int run2;
+	    int notfirstrun;
+
+	    eprintf ("// precedence: r%ii%i <- ", run, ev);
+	    run2 = 0;
+	    notfirstrun = 0;
+	    while (run2 < sys->maxruns)
+	      {
+		int notfirstev;
+		int ev2;
+
+		notfirstev = 0;
+		ev2 = 0;
+		while (ev2 < sys->runs[run2].length)
+		  {
+		    if (graph[graph_nodes (nodes, run2, ev2, run, ev)] != 0)
+		      {
+			if (notfirstev)
+			  eprintf (",");
+			else
+			  {
+			    if (notfirstrun)
+			      eprintf (" ");
+			    eprintf ("r%i:", run2);
+			  }
+			eprintf ("%i", ev2);
+			notfirstrun = 1;
+			notfirstev = 1;
+		      }
+		    ev2++;
+		  }
+		run2++;
+	      }
+	    eprintf ("\n");
+	    ev++;
+	  }
+	run++;
+      }
+  }
+#endif
+
+  // Draw graph
+  // First, all simple runs
+  run = 0;
+  while (run < sys->maxruns)
+    {
+      Roledef rd;
+      int index;
+
+      index = 0;
+      rd = sys->runs[run].start;
+      if (sys->runs[run].protocol != INTRUDER && sys->runs[run].length > 0)
+	{
+	  // Regular run
+
+	  /* DISABLED subgraphs
+	     eprintf ("\tsubgraph cluster_run%i {\n", run);
+	     eprintf ("\t\tlabel = \"");
+	     eprintf ("#%i: ", run);
+	     termPrint (sys->runs[run].protocol->nameterm);
+	     eprintf (", ");
+	     agentsOfRunPrint (sys, run);
+	     eprintf ("\";\n", run);
+	     if (run == 0)
+	     {
+	     eprintf ("\t\tcolor = red;\n");
+	     }
+	     else
+	     {
+	     eprintf ("\t\tcolor = blue;\n");
+	     }
+	   */
+
+
+	  // Display the respective events
+	  while (index < sys->runs[run].length)
+	    {
+	      // Print node itself
+	      eprintf ("\t\t");
+	      node (run, index);
+	      eprintf (" [");
+	      if (run == 0 && index == sys->current_claim->ev)
+		{
+		  eprintf
+		    ("style=filled,fillcolor=mistyrose,color=salmon,shape=doubleoctagon,");
+		}
+	      else
+		{
+		  eprintf ("shape=box,");
+		}
+	      eprintf ("label=\"");
+	      roledefPrintShort (rd);
+	      eprintf ("\"]");
+	      eprintf (";\n");
+
+	      // Print binding to previous node
+	      if (index > sys->runs[run].firstReal)
+		{
+		  // index > 0
+		  eprintf ("\t\t");
+		  node (run, index - 1);
+		  eprintf (" -> ");
+		  node (run, index);
+		  eprintf (" [style=\"bold\", weight=\"10.0\"]");
+		  eprintf (";\n");
+		}
+	      else
+		{
+		  // index <= firstReal
+		  if (index == sys->runs[run].firstReal)
+		    {
+		      // index == firstReal
+		      Roledef rd;
+		      int send_before_read;
+		      int done;
+
+		      // Determine if it is an active role or note
+		      /**
+		       *@todo note that this will probably become a standard function call for role.h
+		       */
+		      rd =
+			roledef_shift (sys->runs[run].start,
+				       sys->runs[run].firstReal);
+		      done = 0;
+		      send_before_read = 0;
+		      while (!done && rd != NULL)
+			{
+			  if (rd->type == READ)
+			    {
+			      done = 1;
+			    }
+			  if (rd->type == SEND)
+			    {
+			      done = 1;
+			      send_before_read = 1;
+			    }
+			  rd = rd->next;
+			}
+		      // Draw the first box
+		      // This used to be drawn only if done && send_before_read, now we always draw it.
+		      eprintf ("\t\ts%i [label=\"Run %i: ", run, run);
+		      termPrint (sys->runs[run].protocol->nameterm);
+		      eprintf (", ");
+		      termPrint (sys->runs[run].role->nameterm);
+		      eprintf ("\\n");
+		      agentsOfRunPrint (sys, run);
+		      eprintf ("\", shape=diamond];\n");
+		      eprintf ("\t\ts%i -> ", run);
+		      node (run, index);
+		      eprintf (" [weight=\"10.0\"];\n");
+		    }
+		}
+	      index++;
+	      rd = rd->next;
+	    }
+	  /* DISABLED subgraphs
+	     eprintf ("\t}\n");
+	   */
+	}
+      run++;
+    }
+
+  // Second, all bindings.
+  // We now determine them ourselves between existing runs
+  run = 0;
+  while (run < sys->maxruns)
+    {
+      if (sys->runs[run].protocol != INTRUDER)
+	{
+	  int ev;
+
+	  ev = 0;
+	  while (ev < sys->runs[run].length)
+	    {
+	      int incoming_arrow_count;
+
+	      void incoming_arrow (int run2, int ev2)
+	      {
+		Roledef rd, rd2;
+
+		incoming_arrow_count++;
+		/*
+		 * We have decided to draw this binding,
+		 * from run2,ev2 to run,ev
+		 * However, me might need to decide some colouring for this node.
+		 */
+		eprintf ("\t");
+		node (run2, ev2);
+		eprintf (" -> ");
+		node (run, ev);
+		eprintf (" ");
+		// decide color
+		rd = roledef_shift (sys->runs[run].start, ev);
+		rd2 = roledef_shift (sys->runs[run2].start, ev2);
+		if (rd->type == CLAIM)
+		  {
+		    // Towards a claim, so only indirect dependency
+		    eprintf ("[color=cornflowerblue]");
+		  }
+		else
+		  {
+		    // Not towards claim should imply towards read,
+		    // but we check it to comply with future stuff.
+		    if (rd->type == READ && rd2->type == SEND)
+		      {
+			// We want to distinguish where it is from a 'broken' send
+			if (isTermEqual (rd->message, rd2->message))
+			  {
+			    if (isTermEqual
+				(rd->from, rd2->from)
+				&& isTermEqual (rd->to, rd2->to))
+			      {
+				// Wow, a perfect match. Leave the arrow as-is :)
+				eprintf ("[color=forestgreen]");
+			      }
+			    else
+			      {
+				// Same message, different people
+				eprintf
+				  ("[label=\"redirect\",color=darkorange2]");
+			      }
+			  }
+			else
+			  {
+			    // Not even the same message, intruder construction
+			    eprintf ("[label=\"construct\",color=red]");
+			  }
+		      }
+		  }
+		// close up
+		eprintf (";\n");
+	      }
+
+	      incoming_arrow_count = 0;
+	      iterate_incoming_arrows (incoming_arrow, run, ev);
+	      /*
+	       * Currently disabled: generates too much garbage
+	       */
+	      if (false && incoming_arrow_count == 0)
+		{
+		  // No incoming arrows: can be generated from initial intruder knowledge
+		  
+		  from_intruder_count++;
+		  eprintf ("\tintruder -> ");
+		  node (run, ev);
+		  eprintf (";\n");
+		}
+
+	      ev++;
+	    }
+	}
+      run++;
+    }
+
+  // Third, the intruder node (if needed)
+  if (from_intruder_count > 0)
+    {
+      eprintf ("\tintruder [label=\"Initial intruder knowledge\", color=red];\n");
+    }
+
+  // Fourth, all ranking info
+  {
+    int myrank;
+
+#ifdef DEBUG
+    {
+      int n;
+
+      eprintf ("/* ranks: %i\n", maxrank);
+      n = 0;
+      while (n < nodes)
+	{
+	  eprintf ("%i ", ranks[n]);
+	  n++;
+	}
+      eprintf ("\n*/\n\n");
+    }
+#endif
+    myrank = 0;
+    while (myrank < maxrank)
+      {
+	int count;
+	int run;
+	int run1;
+	int ev1;
+
+	count = 0;
+	run = 0;
+	while (run < sys->maxruns)
+	  {
+	    if (sys->runs[run].protocol != INTRUDER)
+	      {
+		int ev;
+
+		ev = 0;
+		while (ev < sys->runs[run].step)
+		  {
+		    if (myrank == ranks[node_number (run, ev)])
+		      {
+			if (count == 0)
+			  eprintf ("\t{ rank = same; ");
+			count++;
+			eprintf ("r%ii%i; ", run, ev);
+		      }
+		    ev++;
+		  }
+	      }
+	    run++;
+	  }
+	if (count > 0)
+	  eprintf ("}\t\t// rank %i\n", myrank);
+	myrank++;
+      }
+  }
+
+  // clean memory
+  memFree (ranks, nodes * sizeof (int));	// ranks
+
+  // close graph
+  eprintf ("};\n\n");
+}
+
diff --git a/src/dotout.h b/src/dotout.h
new file mode 100644
index 0000000..63cad32
--- /dev/null
+++ b/src/dotout.h
@@ -0,0 +1,6 @@
+#ifndef DOTOUTPUT
+#define DOTOUTPUT
+
+void dotSemiState (const System sys);
+
+#endif