diff --git a/build.gradle b/build.gradle
index e52a0f599..60c552d3c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,6 +63,7 @@ dependencies {
     implementation 'net.java.dev.jna:jna:5.11.0'
     implementation 'org.jetbrains:annotations:23.0.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3'
+    implementation 'org.jfree:jfreechart:1.5.5'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
diff --git a/src/main/java/dk/aau/cs/TCTL/XMLParsing/XMLCTLQueryParser.java b/src/main/java/dk/aau/cs/TCTL/XMLParsing/XMLCTLQueryParser.java
index f92faeeb5..bbf037797 100644
--- a/src/main/java/dk/aau/cs/TCTL/XMLParsing/XMLCTLQueryParser.java
+++ b/src/main/java/dk/aau/cs/TCTL/XMLParsing/XMLCTLQueryParser.java
@@ -399,9 +399,7 @@ else if(nodeName.equals("deadlock")){
             }
         } else if (nodeName.equals("control")) {
             return parseFormula(child);
-        }else{
-        	parseFormula(property);
-        }
+        } 
 
         throw new XMLQueryParseException(ERROR_MESSAGE + nodeName);
     }
diff --git a/src/main/java/dk/aau/cs/TCTL/XMLParsing/XMLLTLQueryParser.java b/src/main/java/dk/aau/cs/TCTL/XMLParsing/XMLLTLQueryParser.java
index 0c69b2162..2421f61d6 100644
--- a/src/main/java/dk/aau/cs/TCTL/XMLParsing/XMLLTLQueryParser.java
+++ b/src/main/java/dk/aau/cs/TCTL/XMLParsing/XMLLTLQueryParser.java
@@ -333,7 +333,9 @@ private TCTLAbstractProperty parseFormula(Node property)
                 }
                 return new TCTLOrListNode(transitions);
             }
-        } else{
+        } else if(nodeName.equals("deadlock")) {
+            return new TCTLDeadlockNode();
+        } else {
             parseFormula(property);
         }
 
diff --git a/src/main/java/dk/aau/cs/TCTL/visitors/LTLQueryVisitor.java b/src/main/java/dk/aau/cs/TCTL/visitors/LTLQueryVisitor.java
index 3bcb9b75c..04e7d3c33 100644
--- a/src/main/java/dk/aau/cs/TCTL/visitors/LTLQueryVisitor.java
+++ b/src/main/java/dk/aau/cs/TCTL/visitors/LTLQueryVisitor.java
@@ -7,43 +7,43 @@
 
 public class LTLQueryVisitor extends VisitorBase {
 
-    private static final String XML_NS 			        = "xmlns=\"http://tapaal.net/\"";
-    private static final String XML_PROPSET 		    = "property-set";
-    private static final String XML_PROP			    = "property";
-    private static final String XML_PROPID			    = "id";
-    private static final String XML_PROPDESC		    = "description";
-    private static final String XML_FORMULA		    	= "formula";
-    private static final String XML_ALLPATHS	    	= "all-paths";
-    private static final String XML_EXISTSPATH	    	= "exists-path";
-    private static final String XML_NEGATION	    	= "negation";
-    private static final String XML_CONJUNCTION 		= "conjunction";
-    private static final String XML_DISJUNCTION 		= "disjunction";
-    private static final String XML_GLOBALLY		    = "globally";
-    private static final String XML_FINALLY			    = "finally";
-    private static final String XML_NEXT			    = "next";
-    private static final String XML_UNTIL 		    	= "until";
-    private static final String XML_BEFORE 			    = "before";
-    private static final String XML_REACH 		    	= "reach";
-    private static final String XML_DEADLOCK 		    = "deadlock";
-    private static final String XML_TRUE 			    = "true";
-    private static final String XML_FALSE 			    = "false";
-    private static final String XML_INTEGERLT 		    = "integer-lt";
-    private static final String XML_INTEGERLE 		    = "integer-le";
-    private static final String XML_INTEGEREQ		    = "integer-eq";
-    private static final String XML_INTEGERNE 		    = "integer-ne";
-    private static final String XML_INTEGERGT 		    = "integer-gt";
-    private static final String XML_INTEGERGE           = "integer-ge";
-    private static final String XML_ISFIREABLE		    = "is-fireable";
-    private static final String XML_INTEGERCONSTANT 	= "integer-constant";
-    private static final String XML_TOKENSCOUNT 		= "tokens-count";
-    private static final String XML_PLACE 			    = "place";
-    private static final String XML_TRANSITION		    = "transition";
-    private static final String XML_INTEGERSUM          = "integer-sum";
-    private static final String XML_INTEGERPRODUCT      = "integer-product";
-    private static final String XML_INTEGERDIFFERENCE   = "integer-difference";
-
-
-    private final StringBuffer xmlQuery = new StringBuffer();
+    protected static final String XML_NS 			        = "xmlns=\"http://tapaal.net/\"";
+    protected static final String XML_PROPSET 		    = "property-set";
+    protected static final String XML_PROP			    = "property";
+    protected static final String XML_PROPID			    = "id";
+    protected static final String XML_PROPDESC		    = "description";
+    protected static final String XML_FORMULA		    	= "formula";
+    protected static final String XML_ALLPATHS	    	= "all-paths";
+    protected static final String XML_EXISTSPATH	    	= "exists-path";
+    protected static final String XML_NEGATION	    	= "negation";
+    protected static final String XML_CONJUNCTION 		= "conjunction";
+    protected static final String XML_DISJUNCTION 		= "disjunction";
+    protected static final String XML_GLOBALLY		    = "globally";
+    protected static final String XML_FINALLY			    = "finally";
+    protected static final String XML_NEXT			    = "next";
+    protected static final String XML_UNTIL 		    	= "until";
+    protected static final String XML_BEFORE 			    = "before";
+    protected static final String XML_REACH 		    	= "reach";
+    protected static final String XML_DEADLOCK 		    = "deadlock";
+    protected static final String XML_TRUE 			    = "true";
+    protected static final String XML_FALSE 			    = "false";
+    protected static final String XML_INTEGERLT 		    = "integer-lt";
+    protected static final String XML_INTEGERLE 		    = "integer-le";
+    protected static final String XML_INTEGEREQ		    = "integer-eq";
+    protected static final String XML_INTEGERNE 		    = "integer-ne";
+    protected static final String XML_INTEGERGT 		    = "integer-gt";
+    protected static final String XML_INTEGERGE           = "integer-ge";
+    protected static final String XML_ISFIREABLE		    = "is-fireable";
+    protected static final String XML_INTEGERCONSTANT 	= "integer-constant";
+    protected static final String XML_TOKENSCOUNT 		= "tokens-count";
+    protected static final String XML_PLACE 			    = "place";
+    protected static final String XML_TRANSITION		    = "transition";
+    protected static final String XML_INTEGERSUM          = "integer-sum";
+    protected static final String XML_INTEGERPRODUCT      = "integer-product";
+    protected static final String XML_INTEGERDIFFERENCE   = "integer-difference";
+
+
+    protected final StringBuffer xmlQuery = new StringBuffer();
 
     public LTLQueryVisitor() {
         super();
@@ -83,7 +83,7 @@ public String getEndTag(){
         return endTag(XML_PROPSET) + "\n";
     }
 
-    private String queryInfo(String queryName){
+    protected String queryInfo(String queryName){
         String nameToPrint = (queryName == null) ? "Query Comment/Name Here" : queryName;
         return wrapInTag(nameToPrint, XML_PROPID) + wrapInTag(nameToPrint, XML_PROPDESC);
     }
@@ -234,16 +234,16 @@ public void visit(TCTLAtomicPropositionNode atomicPropositionNode, Object contex
         xmlQuery.append(endTag(op));
     }
 
-    private String wrapInTag(String str, String tag){
+    protected String wrapInTag(String str, String tag){
         return startTag(tag) + str + endTag(tag);
     }
-    private String startTag(String tag){
+    protected String startTag(String tag){
         return "<" + tag + ">";
     }
-    private String endTag(String tag){
+    protected String endTag(String tag){
         return "</" + tag + ">";
     }
-    private String emptyElement(String tag){
+    protected String emptyElement(String tag){
         return startTag(tag + "/");
     }
 }
diff --git a/src/main/java/dk/aau/cs/TCTL/visitors/SMCQueryVisitor.java b/src/main/java/dk/aau/cs/TCTL/visitors/SMCQueryVisitor.java
new file mode 100644
index 000000000..7d9d406a5
--- /dev/null
+++ b/src/main/java/dk/aau/cs/TCTL/visitors/SMCQueryVisitor.java
@@ -0,0 +1,58 @@
+package dk.aau.cs.TCTL.visitors;
+
+import dk.aau.cs.TCTL.*;
+import dk.aau.cs.verification.SMCSettings;
+
+public class SMCQueryVisitor extends LTLQueryVisitor {
+
+    private static final String XML_SMC		    	        = "smc";
+    private static final String XML_TIME_BOUND_TAG          = "time-bound";
+    private static final String XML_STEP_BOUND_TAG          = "step-bound";
+    private static final String XML_FALSE_POS_TAG           = "false-positives";
+    private static final String XML_FALSE_NEG_TAG           = "false-negatives";
+    private static final String XML_INDIFFERENCE_TAG        = "indifference";
+    private static final String XML_CONFIDENCE_TAG          = "confidence";
+    private static final String XML_INTERVAL_WIDTH_TAG      = "interval-width";
+    private static final String XML_COMPARE_TO_FLOAT_TAG    = "compare-to";
+
+    public String getXMLQueryFor(TCTLAbstractProperty property, String queryName, SMCSettings settings) {
+        buildXMLQuery(property, queryName, settings);
+        return getFormatted();
+    }
+
+    public void buildXMLQuery(TCTLAbstractProperty property, String queryName, SMCSettings settings) {
+        xmlQuery.append(startTag(XML_PROP) + queryInfo(queryName) + smcTag(settings) + startTag(XML_FORMULA));
+        property.accept(this, null);
+        xmlQuery.append(endTag(XML_FORMULA) + endTag(XML_PROP));
+    }
+
+    private String smcTag(SMCSettings settings) {
+        String tagContent = XML_SMC;
+        if(settings.timeBound < Integer.MAX_VALUE)
+            tagContent += tagAttribute(XML_TIME_BOUND_TAG, settings.timeBound);
+        if(settings.stepBound < Integer.MAX_VALUE)
+            tagContent += tagAttribute(XML_STEP_BOUND_TAG, settings.stepBound);
+        if(settings.compareToFloat) {
+            tagContent += tagAttribute(XML_FALSE_POS_TAG, settings.falsePositives);
+            tagContent += tagAttribute(XML_FALSE_NEG_TAG, settings.falseNegatives);
+            tagContent += tagAttribute(XML_INDIFFERENCE_TAG, settings.indifferenceWidth);
+            tagContent += tagAttribute(XML_COMPARE_TO_FLOAT_TAG, settings.geqThan);
+        } else {
+            tagContent += tagAttribute(XML_CONFIDENCE_TAG, settings.confidence);
+            tagContent += tagAttribute(XML_INTERVAL_WIDTH_TAG, settings.estimationIntervalWidth);
+        }
+        return emptyElement(tagContent);
+    }
+
+    private String tagAttribute(String name, String value) {
+        return " " + name + "=\"" + value + "\"";
+    }
+
+    private String tagAttribute(String name, float value) {
+        return " " + name + "=\"" + String.valueOf(value) + "\"";
+    }
+
+    private String tagAttribute(String name, int value) {
+        return " " + name + "=\"" + String.valueOf(value) + "\"";
+    }
+}
diff --git a/src/main/java/dk/aau/cs/approximation/ApproximationWorker.java b/src/main/java/dk/aau/cs/approximation/ApproximationWorker.java
index 3d7e61805..1d2ac37ea 100644
--- a/src/main/java/dk/aau/cs/approximation/ApproximationWorker.java
+++ b/src/main/java/dk/aau/cs/approximation/ApproximationWorker.java
@@ -456,7 +456,7 @@ else if (k instanceof TimedTransitionStep) {
 		} else {
             NameMapping nameMapping = isColored? result.getUnfoldedModel().value2(): transformedModel.value2();
             TimedArcPetriNetNetwork netNetwork = isColored? result.getUnfoldedModel().value1().parentNetwork(): model;
-            if (dataLayerQuery != null && dataLayerQuery.getCategory() == net.tapaal.gui.petrinet.verification.TAPNQuery.QueryCategory.HyperLTL) {
+            if (dataLayerQuery != null && dataLayerQuery.getCategory() == net.tapaal.gui.petrinet.verification.TAPNQuery.QueryCategory.HyperLTL || dataLayerQuery.getCategory() == net.tapaal.gui.petrinet.verification.TAPNQuery.QueryCategory.SMC) {
                 toReturn =  new VerificationResult<>(
                     result.getQueryResult(),
                     decomposeTrace(result.getTraceMap(), nameMapping, netNetwork),
@@ -486,7 +486,7 @@ else if (k instanceof TimedTransitionStep) {
 		
 		options.setTraceOption(oldTraceOption);
 		// if the old traceoption was none, we need to set the results traces to null so GUI doesn't try to display the traces later
-		if (oldTraceOption == TraceOption.NONE && toReturn != null){
+		if (oldTraceOption == TraceOption.NONE && toReturn != null && dataLayerQuery.getCategory() != net.tapaal.gui.petrinet.verification.TAPNQuery.QueryCategory.SMC) {
 			toReturn.setTrace(null);
 			toReturn.setSecondaryTrace(null);
 		}
@@ -527,8 +527,9 @@ public VerificationResult<TimedArcPetriNetTrace> batchWorker(
         boolean modelIsColored = composedModel.value1().isColored();
         boolean modelIsTimed = !composedModel.value1().isUntimed();
         boolean modelIsGame = composedModel.value1().hasUncontrollableTransitions();
+        boolean modelIsStochastic = composedModel.value1().isStochastic();
 
-        TAPNLens lens = new TAPNLens(modelIsTimed, modelIsGame, modelIsColored);
+        TAPNLens lens = new TAPNLens(modelIsTimed, modelIsGame, modelIsColored, modelIsStochastic);
 
 		VerificationResult<TimedArcPetriNetTrace> verificationResult = modelChecker.verify(options, composedModel, queryToVerify, null, query, lens);
 		
diff --git a/src/main/java/dk/aau/cs/io/LoadedModel.java b/src/main/java/dk/aau/cs/io/LoadedModel.java
index dd07ce3a7..21a44ea25 100644
--- a/src/main/java/dk/aau/cs/io/LoadedModel.java
+++ b/src/main/java/dk/aau/cs/io/LoadedModel.java
@@ -35,9 +35,10 @@ public TAPNLens getLens(){
         } else {
             boolean isNetTimed = !network().isUntimed();
             boolean isNetGame = network().hasUncontrollableTransitions();
-            boolean isNetColored = network.isColored();
+            boolean isNetColored = network().isColored();
+            boolean isNetStochastic = network().isStochastic();
 
-            return new TAPNLens(isNetTimed, isNetGame, isNetColored);
+            return new TAPNLens(isNetTimed, isNetGame, isNetColored, isNetStochastic);
         }
     }
     public boolean isColored(){
diff --git a/src/main/java/dk/aau/cs/io/PNMLWriter.java b/src/main/java/dk/aau/cs/io/PNMLWriter.java
index 414f4d970..11e0e9d94 100644
--- a/src/main/java/dk/aau/cs/io/PNMLWriter.java
+++ b/src/main/java/dk/aau/cs/io/PNMLWriter.java
@@ -247,6 +247,7 @@ private Element createTransitionElement(TimedTransitionComponent inputTransition
 		
 		Element transitionElement = document.createElement("transition");
 		transitionElement.setAttribute("id", (inputTransition.getId() != null ? inputTransition.getId()	: "error"));
+        inputTransition.underlyingTransition().getDistribution().writeToXml(transitionElement);
 
 		Element name = document.createElement("name"); //Name
 		transitionElement.appendChild(name);
@@ -276,6 +277,7 @@ private Element createColoredTransitionElement (TimedTransitionComponent inputTr
 
         Element transitionElement = document.createElement("transition");
         transitionElement.setAttribute("id", (inputTransition.getId() != null ? inputTransition.getId()	: "error"));
+        inputTransition.underlyingTransition().getDistribution().writeToXml(transitionElement);
 
         Element name = document.createElement("name"); //Name
         transitionElement.appendChild(name);
diff --git a/src/main/java/dk/aau/cs/io/PNMLoader.java b/src/main/java/dk/aau/cs/io/PNMLoader.java
index d9d109a89..50196874a 100644
--- a/src/main/java/dk/aau/cs/io/PNMLoader.java
+++ b/src/main/java/dk/aau/cs/io/PNMLoader.java
@@ -116,7 +116,7 @@ private LoadedModel parse(Document doc) throws FormatException {
         Node pnmlElement = doc.getElementsByTagName("pnml").item(0);
         Node netNode = getFirstDirectChild(pnmlElement, "net");
 
-        lens = new TAPNLens(false, false, getFirstDirectChild(netNode, "declaration") != null);
+        lens = new TAPNLens(false, false, getFirstDirectChild(netNode, "declaration") != null, false);
 
         String name = getTAPNName(netNode);
 
diff --git a/src/main/java/dk/aau/cs/io/TapnEngineXmlLoader.java b/src/main/java/dk/aau/cs/io/TapnEngineXmlLoader.java
index 46b8eb2da..2480b4e1a 100644
--- a/src/main/java/dk/aau/cs/io/TapnEngineXmlLoader.java
+++ b/src/main/java/dk/aau/cs/io/TapnEngineXmlLoader.java
@@ -6,6 +6,10 @@
 import dk.aau.cs.model.CPN.*;
 import dk.aau.cs.model.CPN.Expressions.*;
 import dk.aau.cs.model.tapn.*;
+import dk.aau.cs.model.tapn.simulation.FiringMode;
+import dk.aau.cs.model.tapn.simulation.OldestFiringMode;
+import dk.aau.cs.model.tapn.simulation.RandomFiringMode;
+import dk.aau.cs.model.tapn.simulation.YoungestFiringMode;
 import dk.aau.cs.util.FormatException;
 import dk.aau.cs.util.Require;
 import kotlin.Pair;
@@ -104,7 +108,7 @@ private LoadedModel parse(Document doc) throws FormatException {
             network.add(ColorType.COLORTYPE_DOT);
         }
 		parseSharedPlaces(doc, network, constants);
-		parseSharedTransitions(doc, network);
+		parseSharedTransitions(doc, network, constants);
 		
 		Collection<Template> templates = parseTemplates(doc, network, constants);
 		LoadedQueries loadedQueries = new TAPNQueryLoader(doc, network).parseQueries();
@@ -140,7 +144,10 @@ private void parseFeature(Document doc, TimedArcPetriNetNetwork network) {
             var isColoredElement = nodeList.item(0).getAttributes().getNamedItem("isColored");
             boolean isColored = isColoredElement == null ? network.isColored() : Boolean.parseBoolean(isColoredElement.getNodeValue());
 
-            lens = new TAPNLens(isTimed, isGame, isColored);
+            var isStochasticElement = nodeList.item(0).getAttributes().getNamedItem("isColored");
+            boolean isStochastic = isStochasticElement == null ? network.isStochastic() : Boolean.parseBoolean(isStochasticElement.getNodeValue());
+
+            lens = new TAPNLens(isTimed, isGame, isColored, isStochastic);
         }
     }
 
@@ -154,7 +161,10 @@ private void parseFeature(Document doc) {
             var isGame = Boolean.parseBoolean(nodeList.item(0).getAttributes().getNamedItem("isGame").getNodeValue());
             var isColored = Boolean.parseBoolean(nodeList.item(0).getAttributes().getNamedItem("isColored").getNodeValue());
 
-            lens = new TAPNLens(isTimed, isGame, isColored);
+            var stochasticEl = nodeList.item(0).getAttributes().getNamedItem("isStochastic");
+            var isStochastic = stochasticEl != null && Boolean.parseBoolean(stochasticEl.getNodeValue());
+
+            lens = new TAPNLens(isTimed, isGame, isColored, isStochastic);
         }
     }
 
@@ -193,30 +203,61 @@ private SharedPlace parseSharedPlace(Element element, TimedArcPetriNetNetwork ne
         return place;
 	}
 
-	private void parseSharedTransitions(Document doc, TimedArcPetriNetNetwork network) {
+	private void parseSharedTransitions(Document doc, TimedArcPetriNetNetwork network, ConstantStore constants) {
 		NodeList sharedTransitionNodes = doc.getElementsByTagName("shared-transition");
 
 		for(int i = 0; i < sharedTransitionNodes.getLength(); i++){
 			Node node = sharedTransitionNodes.item(i);
 
 			if(node instanceof Element){
-				SharedTransition transition = parseSharedTransition((Element)node);
+				SharedTransition transition = parseSharedTransition((Element)node, constants);
 				network.add(transition);
 			}
 		}
 	}
 
-	private SharedTransition parseSharedTransition(Element element) {
+	private SharedTransition parseSharedTransition(Element element, ConstantStore constants) {
 		String name = element.getAttribute("name");
 		boolean urgent = Boolean.parseBoolean(element.getAttribute("urgent"));
         boolean isUncontrollable = element.getAttribute("player").equals("1");
+        String distrib = element.getAttribute("distribution");
+        String weightStr = element.getAttribute("weight");
+		String firingModeStr = element.getAttribute("firingMode");
+        SMCDistribution distribution = SMCDistribution.defaultDistribution();
+        Probability weight = new DoubleProbability(1.0);
+		FiringMode firingMode = new OldestFiringMode();
+        if(!distrib.isEmpty()){
+            distribution = SMCDistribution.parseXml(element);
+        }
+        if(!weightStr.isEmpty()) {
+            weight = Probability.parseProbability(weightStr, constants);
+        }
+		if (!firingModeStr.isEmpty()) {
+			firingMode = getFiringMode(firingModeStr);
+		}
 		
 		SharedTransition st = new SharedTransition(name);
 		st.setUrgent(urgent);
 		st.setUncontrollable(isUncontrollable);
+        st.setDistribution(distribution);
+        st.setWeight(weight);
+		st.setFiringMode(firingMode);
 		return st;
 	}
 
+	private FiringMode getFiringMode(String firingModeStr) {
+		switch (firingModeStr) {
+			case "Oldest":
+				return new OldestFiringMode();
+			case "Youngest":
+				return new YoungestFiringMode();
+			case "Random":
+				return new RandomFiringMode();
+			default:
+				return null;
+		}
+	}
+
 	private Collection<Template> parseTemplates(Document doc, TimedArcPetriNetNetwork network, ConstantStore constants) throws FormatException {
 		Collection<Template> templates = new ArrayList<Template>();
 		NodeList nets = doc.getElementsByTagName("net");
@@ -293,7 +334,7 @@ private void parseElement(Element element, Template template, TimedArcPetriNetNe
 			TimedPlaceComponent place = parsePlace(element, network, template.model(), constants);
 			template.guiModel().addPetriNetObject(place);
 		} else if ("transition".equals(element.getNodeName())) {
-			TimedTransitionComponent transition = parseTransition(element, network, template.model());
+			TimedTransitionComponent transition = parseTransition(element, network, template.model(), constants);
 			template.guiModel().addPetriNetObject(transition);
 		} else if (element.getNodeName().matches("arc|outputArc|inputArc|inhibitorArc|transportArc")) {
             parseAndAddArc(element, template, constants, network);
@@ -364,19 +405,25 @@ private AnnotationNote parseAnnotation(Element annotation) {
         return new AnnotationNote(text, positionXInput, positionYInput, widthInput, heightInput, borderInput);
 	}
 
-	private TimedTransitionComponent parseTransition(Element transition, TimedArcPetriNetNetwork network, TimedArcPetriNet tapn) {
+	private TimedTransitionComponent parseTransition(Element transition, TimedArcPetriNetNetwork network, TimedArcPetriNet tapn, ConstantStore constants) {
 		String posX = transition.getAttribute("positionX");
 		String posY = transition.getAttribute("positionY");
 		String nameOffsetX = transition.getAttribute("nameOffsetX");
 		String nameOffsetY = transition.getAttribute("nameOffsetY");
 		String angleStr = transition.getAttribute("angle");
 		String priorityStr = transition.getAttribute("priority");
+        String distrib = transition.getAttribute("distribution");
+        String weightStr = transition.getAttribute("weight");
+		String firingModeStr = transition.getAttribute("firingMode");
 	    int positionXInput = 0;
 		int positionYInput = 0;
 		int nameOffsetXInput = 0;
 		int nameOffsetYInput = 0;
 		int angle = 0;
         int priority = 0;
+        SMCDistribution distribution = SMCDistribution.defaultDistribution();
+        Probability weight = new DoubleProbability(1.0);
+		FiringMode firingMode = new OldestFiringMode();
 		if(!posX.isEmpty()){
 		    positionXInput = (int)Double.parseDouble(posX);
         }
@@ -402,6 +449,16 @@ private TimedTransitionComponent parseTransition(Element transition, TimedArcPet
 		if(!priorityStr.isEmpty()){
 		    priority = Integer.parseInt(priorityStr);
         }
+        if(!distrib.isEmpty()){
+            distribution = SMCDistribution.parseXml(transition);
+        }
+        if(!weightStr.isEmpty()) {
+            weight = Probability.parseProbability(weightStr, constants);
+        }
+		if (!firingModeStr.isEmpty()) {
+			firingMode = getFiringMode(firingModeStr);
+		}
+
 		String idInput = transition.getAttribute("id");
 		String nameInput = transition.getAttribute("name");
 		boolean isUrgent = Boolean.parseBoolean(transition.getAttribute("urgent"));
@@ -436,6 +493,9 @@ private TimedTransitionComponent parseTransition(Element transition, TimedArcPet
 		TimedTransition t = new TimedTransition(nameInput, guardExpr);
 		t.setUrgent(isUrgent);
 		t.setUncontrollable(player.equals("1"));
+        t.setDistribution(distribution);
+        t.setWeight(weight);
+		t.setFiringMode(firingMode);
 		if(network.isNameUsedForShared(nameInput)){
 			t.setName(nameGenerator.getNewTransitionName(tapn)); // introduce temporary name to avoid exceptions
 			tapn.add(t);
diff --git a/src/main/java/dk/aau/cs/io/TapnXmlLoader.java b/src/main/java/dk/aau/cs/io/TapnXmlLoader.java
index 910e71fba..b9167f7a5 100644
--- a/src/main/java/dk/aau/cs/io/TapnXmlLoader.java
+++ b/src/main/java/dk/aau/cs/io/TapnXmlLoader.java
@@ -11,6 +11,11 @@
 
 import dk.aau.cs.model.CPN.*;
 import dk.aau.cs.model.CPN.Expressions.*;
+import dk.aau.cs.model.tapn.*;
+import dk.aau.cs.model.tapn.simulation.FiringMode;
+import dk.aau.cs.model.tapn.simulation.OldestFiringMode;
+import dk.aau.cs.model.tapn.simulation.RandomFiringMode;
+import dk.aau.cs.model.tapn.simulation.YoungestFiringMode;
 import kotlin.Pair;
 import net.tapaal.gui.petrinet.TAPNLens;
 import org.w3c.dom.*;
@@ -18,7 +23,6 @@
 
 import pipe.gui.petrinet.dataLayer.DataLayer;
 import net.tapaal.gui.petrinet.Template;
-import pipe.gui.Constants;
 import pipe.gui.canvas.Zoomer;
 import pipe.gui.petrinet.graphicElements.AnnotationNote;
 import pipe.gui.petrinet.graphicElements.Arc;
@@ -32,24 +36,6 @@
 import pipe.gui.petrinet.graphicElements.tapn.TimedTransportArcComponent;
 import net.tapaal.gui.petrinet.NameGenerator;
 import dk.aau.cs.io.queries.TAPNQueryLoader;
-import dk.aau.cs.model.tapn.Constant;
-import dk.aau.cs.model.tapn.ConstantStore;
-import dk.aau.cs.model.tapn.IntWeight;
-import dk.aau.cs.model.tapn.LocalTimedPlace;
-import dk.aau.cs.model.tapn.SharedPlace;
-import dk.aau.cs.model.tapn.SharedTransition;
-import dk.aau.cs.model.tapn.TimeInterval;
-import dk.aau.cs.model.tapn.TimeInvariant;
-import dk.aau.cs.model.tapn.TimedArcPetriNet;
-import dk.aau.cs.model.tapn.TimedArcPetriNetNetwork;
-import dk.aau.cs.model.tapn.TimedInhibitorArc;
-import dk.aau.cs.model.tapn.TimedInputArc;
-import dk.aau.cs.model.tapn.TimedOutputArc;
-import dk.aau.cs.model.tapn.TimedPlace;
-import dk.aau.cs.model.tapn.TimedToken;
-import dk.aau.cs.model.tapn.TimedTransition;
-import dk.aau.cs.model.tapn.TransportArc;
-import dk.aau.cs.model.tapn.Weight;
 import dk.aau.cs.util.FormatException;
 import dk.aau.cs.util.Require;
 
@@ -161,7 +147,7 @@ private LoadedModel parse(Document doc) throws FormatException {
             network.add(ColorType.COLORTYPE_DOT);
         }
 		parseSharedPlaces(doc, network, constants);
-		parseSharedTransitions(doc, network);
+		parseSharedTransitions(doc, network, constants);
         parseFeature(doc, network);
 
         Collection<Template> templates = parseTemplates(doc, network, constants);
@@ -197,7 +183,10 @@ private void parseFeature(Document doc, TimedArcPetriNetNetwork network) {
             var isColoredElement = nodeList.item(0).getAttributes().getNamedItem("isColored");
             boolean isColored = isColoredElement == null ? network.isColored() : Boolean.parseBoolean(isColoredElement.getNodeValue());
 
-            lens = new TAPNLens(isTimed, isGame, isColored);
+            var isStochasticElement = nodeList.item(0).getAttributes().getNamedItem("isStochastic");
+            boolean isStochastic = isStochasticElement == null ? network.isStochastic() : Boolean.parseBoolean(isStochasticElement.getNodeValue());
+
+            lens = new TAPNLens(isTimed, isGame, isColored, isStochastic);
         }
     }
 
@@ -211,7 +200,10 @@ private void parseFeature(Document doc) {
             var isGame = Boolean.parseBoolean(nodeList.item(0).getAttributes().getNamedItem("isGame").getNodeValue());
             var isColored = Boolean.parseBoolean(nodeList.item(0).getAttributes().getNamedItem("isColored").getNodeValue());
 
-            lens = new TAPNLens(isTimed, isGame, isColored);
+            var stochasticElement = nodeList.item(0).getAttributes().getNamedItem("isStochastic");
+            var isStochastic = stochasticElement != null && Boolean.parseBoolean(stochasticElement.getNodeValue());
+
+            lens = new TAPNLens(isTimed, isGame, isColored, isStochastic);
         }
     }
 
@@ -250,30 +242,61 @@ private SharedPlace parseSharedPlace(Element element, TimedArcPetriNetNetwork ne
         return place;
 	}
 
-	private void parseSharedTransitions(Document doc, TimedArcPetriNetNetwork network) {
+	private void parseSharedTransitions(Document doc, TimedArcPetriNetNetwork network, ConstantStore constants) {
 		NodeList sharedTransitionNodes = doc.getElementsByTagName("shared-transition");
 
 		for(int i = 0; i < sharedTransitionNodes.getLength(); i++){
 			Node node = sharedTransitionNodes.item(i);
 
 			if(node instanceof Element){
-				SharedTransition transition = parseSharedTransition((Element)node);
+				SharedTransition transition = parseSharedTransition((Element)node, constants);
 				network.add(transition);
 			}
 		}
 	}
 
-	private SharedTransition parseSharedTransition(Element element) {
+	private SharedTransition parseSharedTransition(Element element, ConstantStore constants) {
 		String name = element.getAttribute("name");
 		boolean urgent = Boolean.parseBoolean(element.getAttribute("urgent"));
         boolean isUncontrollable = element.getAttribute("player").equals("1");
+        String distrib = element.getAttribute("distribution");
+        String weightStr = element.getAttribute("weight");
+		String firingModeStr = element.getAttribute("firingMode");
+        SMCDistribution distribution = SMCDistribution.defaultDistribution();
+        Probability weight = new DoubleProbability(1.0);
+		FiringMode firingMode = new OldestFiringMode();
+        if(!distrib.isEmpty()){
+            distribution = SMCDistribution.parseXml(element);
+        }
+        if(!weightStr.isEmpty()) {
+            weight = Probability.parseProbability(weightStr, constants);
+        }
+		if (!firingModeStr.isEmpty()) {
+			firingMode = getFiringMode(firingModeStr);
+		}
 		
 		SharedTransition st = new SharedTransition(name);
 		st.setUrgent(urgent);
 		st.setUncontrollable(isUncontrollable);
+        st.setDistribution(distribution);
+        st.setWeight(weight);
+		st.setFiringMode(firingMode);
 		return st;
 	}
 
+	private FiringMode getFiringMode(String firingModeStr) {
+		switch (firingModeStr) {
+			case "Oldest":
+				return new OldestFiringMode();
+			case "Youngest":
+				return new YoungestFiringMode();
+			case "Random":
+				return new RandomFiringMode();
+			default:
+				return null;
+		}
+	}
+
 	private Collection<Template> parseTemplates(Document doc, TimedArcPetriNetNetwork network, ConstantStore constants) throws FormatException {
 		Collection<Template> templates = new ArrayList<Template>();
 		NodeList nets = doc.getElementsByTagName("net");
@@ -349,7 +372,7 @@ private void parseElement(Element element, Template template, TimedArcPetriNetNe
 			TimedPlaceComponent place = parsePlace(element, network, template.model(), constants);
 			template.guiModel().addPetriNetObject(place);
 		} else if ("transition".equals(element.getNodeName())) {
-			TimedTransitionComponent transition = parseTransition(element, network, template.model());
+			TimedTransitionComponent transition = parseTransition(element, network, template.model(), constants);
 			template.guiModel().addPetriNetObject(transition);
 		} else if (element.getNodeName().matches("arc|outputArc|inputArc|inhibitorArc|transportArc")) {
             parseAndAddArc(element, template, constants, network);
@@ -420,19 +443,26 @@ private AnnotationNote parseAnnotation(Element annotation) {
         return new AnnotationNote(text, positionXInput, positionYInput, widthInput, heightInput, borderInput);
 	}
 
-	private TimedTransitionComponent parseTransition(Element transition, TimedArcPetriNetNetwork network, TimedArcPetriNet tapn) {
+	private TimedTransitionComponent parseTransition(Element transition, TimedArcPetriNetNetwork network, TimedArcPetriNet tapn, ConstantStore constants) {
 		String posX = transition.getAttribute("positionX");
 		String posY = transition.getAttribute("positionY");
 		String nameOffsetX = transition.getAttribute("nameOffsetX");
 		String nameOffsetY = transition.getAttribute("nameOffsetY");
 		String angleStr = transition.getAttribute("angle");
 		String priorityStr = transition.getAttribute("priority");
+        String distrib = transition.getAttribute("distribution");
+        String weightStr = transition.getAttribute("weight");
+		String firingModeStr = transition.getAttribute("firingMode");
 	    int positionXInput = 0;
 		int positionYInput = 0;
 		int nameOffsetXInput = 0;
 		int nameOffsetYInput = 0;
 		int angle = 0;
         int priority = 0;
+        SMCDistribution distribution = SMCDistribution.defaultDistribution();
+        Probability weight = new DoubleProbability(1.0);
+		FiringMode firingMode = new OldestFiringMode();
+
 		if(!posX.isEmpty()){
 		    positionXInput = (int)Double.parseDouble(posX);
         }
@@ -451,6 +481,15 @@ private TimedTransitionComponent parseTransition(Element transition, TimedArcPet
 		if(!priorityStr.isEmpty()){
 		    priority = Integer.parseInt(priorityStr);
         }
+        if(!distrib.isEmpty()){
+            distribution = SMCDistribution.parseXml(transition);
+        }
+        if(!weightStr.isEmpty()) {
+            weight = Probability.parseProbability(weightStr, constants);
+        }
+		if (!firingModeStr.isEmpty()) {
+			firingMode = getFiringMode(firingModeStr);
+		}
 		String idInput = transition.getAttribute("id");
 		String nameInput = transition.getAttribute("name");
 		boolean isUrgent = Boolean.parseBoolean(transition.getAttribute("urgent"));
@@ -484,6 +523,9 @@ private TimedTransitionComponent parseTransition(Element transition, TimedArcPet
 		TimedTransition t = new TimedTransition(nameInput, guardExpr);
 		t.setUrgent(isUrgent);
 		t.setUncontrollable(player.equals("1"));
+        t.setDistribution(distribution);
+        t.setWeight(weight);
+		t.setFiringMode(firingMode);
 		if(network.isNameUsedForShared(nameInput)){
 			t.setName(nameGenerator.getNewTransitionName(tapn)); // introduce temporary name to avoid exceptions
 			tapn.add(t);
diff --git a/src/main/java/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java b/src/main/java/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java
index 42044eeca..cf8affc78 100644
--- a/src/main/java/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java
+++ b/src/main/java/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java
@@ -18,6 +18,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import dk.aau.cs.TCTL.visitors.SMCQueryVisitor;
 import dk.aau.cs.model.CPN.Color;
 import dk.aau.cs.model.CPN.ColoredTimeInterval;
 import dk.aau.cs.model.CPN.ColoredTimeInvariant;
@@ -173,6 +174,7 @@ private void appendFeature(Document document, Element root) {
         String isTimed = "true";
         String isGame = "true";
         String isColored = "true";
+        String isStochastic = "true";
         if (!lens.isTimed()) {
             isTimed = "false";
         }
@@ -182,17 +184,20 @@ private void appendFeature(Document document, Element root) {
         if(!lens.isColored()){
             isColored = "false";
         }
-
-        root.appendChild(createFeatureElement(isTimed, isGame, isColored, document));
+        if(!lens.isStochastic()) {
+            isStochastic = "false";
+        }
+        root.appendChild(createFeatureElement(isTimed, isGame, isColored, isStochastic, document));
     }
 
-    private Element createFeatureElement(String isTimed, String isGame, String isColored, Document document) {
+    private Element createFeatureElement(String isTimed, String isGame, String isColored, String isStochastic, Document document) {
         Require.that(document != null, "Error: document was null");
         Element feature = document.createElement("feature");
 
         feature.setAttribute("isTimed", isTimed);
         feature.setAttribute("isGame", isGame);
         feature.setAttribute("isColored", isColored);
+        feature.setAttribute("isStochastic", isStochastic);
 
         return feature;
     }
@@ -216,6 +221,9 @@ private void appendSharedTransitions(Document document, Element root) {
 			element.setAttribute("name", transition.name());
 			element.setAttribute("urgent", transition.isUrgent()?"true":"false");
             element.setAttribute("player", transition.isUncontrollable() ? "1" : "0");
+            element.setAttribute("weight", transition.getWeight().nameForSaving(saveConstantNames));
+			element.setAttribute("firingMode", transition.getFiringMode().toString());
+            transition.getDistribution().writeToXml(element);
 			root.appendChild(element);
 		}
 	}
@@ -306,7 +314,9 @@ private void appendQueries(Document document, Element root) {
 			if (query.getCategory() == QueryCategory.LTL){
                 newQuery = createLTLQueryElement(query, document);
             } else if(query.getCategory() == QueryCategory.HyperLTL) {
-			    newQuery = createHyperLTLQueryElement(query, document);
+                newQuery = createHyperLTLQueryElement(query, document);
+            } else if(query.getCategory() == QueryCategory.SMC) {
+                newQuery = createSMCQueryElement(query, document);
             }else {
 				newQuery = createCTLQueryElement(query, document);
 			}
@@ -478,6 +488,48 @@ private Element createLTLQueryElement(TAPNQuery query, Document document) {
 
         return queryElement;
     }
+
+    private Element createSMCQueryElement(TAPNQuery query, Document document) {
+        Require.that(query != null, "Error: query was null");
+        Require.that(document != null, "Error: document was null");
+
+        Element queryElement = document.createElement("query");
+        SMCQueryVisitor smcQueryVisitor = new SMCQueryVisitor();
+        smcQueryVisitor.buildXMLQuery(query.getProperty(), query.getName(), query.getSmcSettings());
+
+        try {
+            Element doc = DocumentBuilderFactory
+                .newInstance()
+                .newDocumentBuilder()
+                .parse(new ByteArrayInputStream(smcQueryVisitor.getXMLQuery().toString().getBytes()))
+                .getDocumentElement();
+            Node smcTag = doc.getElementsByTagName("smc").item(0);
+            Node formula = doc.getElementsByTagName("formula").item(0);
+            queryElement.appendChild(document.importNode(smcTag, true));
+            queryElement.appendChild(document.importNode(formula, true));
+        } catch (SAXException | ParserConfigurationException | IOException e) {
+            System.out.println(e + " thrown in savePNML() "
+                + ": dataLayerWriter Class : dataLayer Package: filename=\"");
+            return null;
+        }
+
+        queryElement.setAttribute("name", query.getName());
+        queryElement.setAttribute("type", query.getCategory().toString());
+        queryElement.setAttribute("capacity", "" + query.getCapacity());
+        queryElement.setAttribute("traceOption", ""	+ query.getTraceOption());
+        queryElement.setAttribute("reductionOption", ""	+ query.getReductionOption());
+        queryElement.setAttribute("active", "" + query.isActive());
+        queryElement.setAttribute("algorithmOption", "" + query.getAlgorithmOption());
+        queryElement.setAttribute("timeDarts", "" + query.useTimeDarts());
+        queryElement.setAttribute("gcd", "" + query.useGCD());
+        queryElement.setAttribute("parallel", "" + query.isParallel());
+        queryElement.setAttribute("overApproximation", ""	+ false);
+        queryElement.setAttribute("verificationType", query.getVerificationType().toString());
+        queryElement.setAttribute("numberOfTraces", "" + query.getNumberOfTraces());
+        queryElement.setAttribute("smcTraceType", query.getSmcTraceType().toString());
+
+        return queryElement;
+    }
 	
 	private Node XMLQueryStringToElement(String formulaString){
 		
@@ -605,6 +657,9 @@ private Element createTransitionElement(TimedTransitionComponent inputTransition
 		transitionElement.setAttribute("priority", "0");
 		transitionElement.setAttribute("urgent", inputTransition.underlyingTransition().isUrgent()?"true":"false");
         transitionElement.setAttribute("player", inputTransition.underlyingTransition().isUncontrollable() ? "1" : "0");
+        transitionElement.setAttribute("weight", inputTransition.underlyingTransition().getWeight().nameForSaving(saveConstantNames));
+		transitionElement.setAttribute("firingMode", inputTransition.underlyingTransition().getFiringMode().toString());
+        inputTransition.underlyingTransition().getDistribution().writeToXml(transitionElement);
         writeTACPN.appendColoredTransitionDependencies(inputTransition.underlyingTransition(), document, transitionElement);
 
         return transitionElement;
diff --git a/src/main/java/dk/aau/cs/io/queries/TAPNQueryLoader.java b/src/main/java/dk/aau/cs/io/queries/TAPNQueryLoader.java
index e40f05e38..f4f4c49b9 100644
--- a/src/main/java/dk/aau/cs/io/queries/TAPNQueryLoader.java
+++ b/src/main/java/dk/aau/cs/io/queries/TAPNQueryLoader.java
@@ -6,6 +6,9 @@
 import dk.aau.cs.TCTL.*;
 import dk.aau.cs.TCTL.XMLParsing.XMLHyperLTLQueryParser;
 import dk.aau.cs.TCTL.XMLParsing.XMLLTLQueryParser;
+import dk.aau.cs.verification.SMCSettings;
+import dk.aau.cs.verification.SMCTraceType;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -18,6 +21,7 @@
 import net.tapaal.gui.petrinet.verification.TAPNQuery.QueryCategory;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.SearchOption;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.TraceOption;
+import net.tapaal.gui.petrinet.verification.TAPNQuery.VerificationType;
 import net.tapaal.gui.petrinet.verification.InclusionPlaces;
 import net.tapaal.gui.petrinet.verification.InclusionPlaces.InclusionPlacesOption;
 import dk.aau.cs.TCTL.Parsing.TAPAALQueryParser;
@@ -77,6 +81,7 @@ private TAPNQuery parseTAPNQuery(Element queryElement, TimedArcPetriNetNetwork n
         boolean isCTL = isTypeQuery(queryElement, "CTL");
         boolean isLTL = isTypeQuery(queryElement, "LTL");
         boolean isHyperLTL = isTypeQuery(queryElement, "HyperLTL");
+        boolean isSmc = isTypeQuery(queryElement, "SMC") || hasSmcTag(queryElement);
 
 		boolean siphontrap = getReductionOption(queryElement, "useSiphonTrapAnalysis", false);
 		boolean queryReduction = getReductionOption(queryElement, "useQueryReduction", true);
@@ -87,9 +92,32 @@ private TAPNQuery parseTAPNQuery(Element queryElement, TimedArcPetriNetNetwork n
 		boolean colorFixpoint = getUnfoldingOption(queryElement, "colorFixpoint", true);
         boolean symmetricVars = getUnfoldingOption(queryElement, "symmetricVars", true);
 
+        boolean parallel = getReductionOption(queryElement, "parallel", false);
+        VerificationType verificationType = VerificationType.fromString(queryElement.getAttribute("verificationType"));
+
+        int numberOfTraces;
+        try {
+            numberOfTraces = Integer.parseInt(queryElement.getAttribute("numberOfTraces"));
+        } catch (NumberFormatException e) {
+            numberOfTraces = 1;
+        }
+
+        SMCTraceType smcTraceType = new SMCTraceType(queryElement.getAttribute("smcTraceType"));
+
+        SMCSettings smcSettings = SMCSettings.Default();
+
 		TCTLAbstractProperty query;
         ArrayList<String> tracesArr = new ArrayList<String>();
-		if (queryElement.hasAttribute("type") && queryElement.getAttribute("type").equals("LTL")) {
+        if(isSmc) {
+            NodeList smcTagList = queryElement.getElementsByTagName("smc");
+            if(smcTagList.getLength() > 0) {
+                Element settingsNode = (Element) smcTagList.item(0);
+                smcSettings = parseSmcSettings(settingsNode);
+            } else {
+                smcSettings = SMCSettings.Default();
+            }
+            query = parseLTLQueryProperty(queryElement);
+        } else if (queryElement.hasAttribute("type") && queryElement.getAttribute("type").equals("LTL")) {
             query = parseLTLQueryProperty(queryElement);
         } else if (queryElement.hasAttribute("type") && queryElement.getAttribute("type").equals("HyperLTL")){
 		    query = parseHyperLTLQueryProperty(queryElement);
@@ -106,7 +134,7 @@ private TAPNQuery parseTAPNQuery(Element queryElement, TimedArcPetriNetNetwork n
 			TAPNQuery parsedQuery = new TAPNQuery(comment, capacity, query, traceOption, searchOption, reductionOption, symmetry, gcd, timeDarts, pTrie, overApproximation, reduction, hashTableSize, extrapolationOption, inclusionPlaces, isOverApproximationEnabled, isUnderApproximationEnabled, approximationDenominator, partitioning, colorFixpoint, symmetricVars, network.isColored(), coloredReduction);
 			parsedQuery.setActive(active);
 			parsedQuery.setDiscreteInclusion(discreteInclusion);
-			parsedQuery.setCategory(detectCategory(query, isCTL, isLTL, isHyperLTL));
+			parsedQuery.setCategory(detectCategory(query, isCTL, isLTL, isHyperLTL, isSmc));
 			parsedQuery.setUseSiphontrap(siphontrap);
 			parsedQuery.setUseQueryReduction(queryReduction);
 			parsedQuery.setUseStubbornReduction(stubborn);
@@ -116,16 +144,55 @@ private TAPNQuery parseTAPNQuery(Element queryElement, TimedArcPetriNetNetwork n
 				parsedQuery.setAlgorithmOption(AlgorithmOption.valueOf(algorithmOption));
 			} else if(parsedQuery.getCategory() == QueryCategory.HyperLTL) {
                 parsedQuery.setTraceList(tracesArr);
+            } else if(parsedQuery.getCategory() == QueryCategory.SMC) {
+                parsedQuery.setSmcSettings(smcSettings);
+                parsedQuery.setParallel(parallel);
+                parsedQuery.setVerificationType(verificationType);
+                parsedQuery.setNumberOfTraces(numberOfTraces);
+                parsedQuery.setSmcTraceType(smcTraceType);
             }
 			return parsedQuery;
 		} else
 			return null;
 	}
 
-	public static TAPNQuery.QueryCategory detectCategory(TCTLAbstractProperty query, boolean isCTL, boolean isLTL, boolean isHyperLTL){
+    public static boolean hasSmcTag(Node queryElement) {
+        NodeList children = queryElement.getChildNodes();
+        for(int i = 0 ; i < children.getLength() ; i++) {
+            Node child = children.item(i);
+            if(child.getNodeName().equals("smc")) return true;
+        }
+        return false;
+    }
+
+    public static SMCSettings parseSmcSettings(Element smcTag) {
+        SMCSettings settings = SMCSettings.Default();
+        if(smcTag.hasAttribute("time-bound"))
+            settings.timeBound = Integer.parseInt(smcTag.getAttribute("time-bound"));
+        if(smcTag.hasAttribute("step-bound"))
+            settings.stepBound = Integer.parseInt(smcTag.getAttribute("step-bound"));
+        if(smcTag.hasAttribute("compare-to")) {
+            settings.compareToFloat = true;
+            settings.geqThan = Float.parseFloat(smcTag.getAttribute("compare-to"));
+        }
+        if(smcTag.hasAttribute("confidence"))
+            settings.confidence = Float.parseFloat(smcTag.getAttribute("confidence"));
+        if(smcTag.hasAttribute("interval-width"))
+            settings.estimationIntervalWidth = Float.parseFloat(smcTag.getAttribute("interval-width"));
+        if(smcTag.hasAttribute("false-positives"))
+            settings.falsePositives = Float.parseFloat(smcTag.getAttribute("false-positives"));
+        if(smcTag.hasAttribute("false-negatives"))
+            settings.falsePositives = Float.parseFloat(smcTag.getAttribute("false-negatives"));
+        if(smcTag.hasAttribute("indifference"))
+            settings.indifferenceWidth = Float.parseFloat(smcTag.getAttribute("indifference"));
+        return settings;
+    }
+
+	public static TAPNQuery.QueryCategory detectCategory(TCTLAbstractProperty query, boolean isCTL, boolean isLTL, boolean isHyperLTL, boolean isSmc){
         if (isCTL) return TAPNQuery.QueryCategory.CTL;
         if (isLTL) return QueryCategory.LTL;
         if (isHyperLTL) return QueryCategory.HyperLTL;
+        if (isSmc) return QueryCategory.SMC;
 
         StringPosition[] children = query.getChildren();
 
@@ -163,7 +230,7 @@ public static TAPNQuery.QueryCategory detectCategory(TCTLAbstractProperty query,
         }
         if(query instanceof TCTLPlusListNode){
                 for(TCTLAbstractStateProperty sp : ((TCTLPlusListNode)query).getProperties()) {
-                        if(TAPNQueryLoader.detectCategory(sp, isCTL, isLTL, isHyperLTL) == TAPNQuery.QueryCategory.CTL){
+                        if(TAPNQueryLoader.detectCategory(sp, isCTL, isLTL, isHyperLTL, isSmc) == TAPNQuery.QueryCategory.CTL){
                             return TAPNQuery.QueryCategory.CTL;
                         }
                 }
@@ -171,7 +238,7 @@ public static TAPNQuery.QueryCategory detectCategory(TCTLAbstractProperty query,
 		
                 // If any property has been converted
 		for (StringPosition child : children) {
-			if(TAPNQueryLoader.detectCategory(child.getObject(), isCTL, isLTL, isHyperLTL) == TAPNQuery.QueryCategory.CTL){
+			if(TAPNQueryLoader.detectCategory(child.getObject(), isCTL, isLTL, isHyperLTL, isSmc) == TAPNQuery.QueryCategory.CTL){
 				return TAPNQuery.QueryCategory.CTL;
 			} 
 		}
diff --git a/src/main/java/dk/aau/cs/io/queries/XMLQueryLoader.java b/src/main/java/dk/aau/cs/io/queries/XMLQueryLoader.java
index 86b971a4c..f4b3c670c 100644
--- a/src/main/java/dk/aau/cs/io/queries/XMLQueryLoader.java
+++ b/src/main/java/dk/aau/cs/io/queries/XMLQueryLoader.java
@@ -8,12 +8,14 @@
 import dk.aau.cs.TCTL.XMLParsing.XMLHyperLTLQueryParser;
 import dk.aau.cs.TCTL.XMLParsing.XMLLTLQueryParser;
 import dk.aau.cs.io.LoadedQueries;
+import dk.aau.cs.verification.SMCSettings;
 import net.tapaal.gui.petrinet.TAPNLens;
 import net.tapaal.gui.petrinet.verification.TAPNQuery;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.ExtrapolationOption;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.HashTableSize;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.SearchOption;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.TraceOption;
+import org.w3c.dom.Element;
 import pipe.gui.TAPAALGUI;
 import net.tapaal.gui.petrinet.verification.InclusionPlaces;
 import dk.aau.cs.TCTL.XMLParsing.QueryWrapper;
@@ -101,16 +103,19 @@ public void warning(SAXParseException e) throws SAXException {}
             TAPNLens lens = TAPAALGUI.getCurrentTab().getLens();
             boolean isTimed = (lens != null && lens.isTimed()) || network.isTimed();
             boolean isKnownGame = (lens != null && lens.isGame()); // XXX: This is a hack, not sure why network does not know if it a game, also control tag should used to check if query is a game
+            boolean isStochastic = (lens != null && lens.isStochastic());
             boolean canBeCTL = isTimed || canBeCTL(prop);
             boolean canBeLTL = !isTimed && !isKnownGame && canBeLTL(prop);
             boolean canBeHyperLTL = !isTimed && !isKnownGame && canBeHyperLTL(prop);
+            boolean hasSmcTag = TAPNQueryLoader.hasSmcTag(prop);
+            boolean isSmc = isStochastic && hasSmcTag;
 
             int counter = 0;
             if (canBeCTL) counter += 1;
             if (canBeLTL) counter += 1;
             if (canBeHyperLTL) counter += 1;
 
-            if (counter > 1 && choice == -1 && queryCategories == null) {
+            if (counter > 1 && choice == -1 && queryCategories == null && !isSmc) {
                 choice = JOptionPane.showOptionDialog(TAPAALGUI.getApp(),
                     "There were some queries that can be classified as CTL, LTL or HyperLTL. \nHow do you want to import them?",
                     "Choose query category",
@@ -136,11 +141,13 @@ public void warning(SAXParseException e) throws SAXException {}
                     isLTL = true;
                 } else if (queryCategories.get(i) == TAPNQuery.QueryCategory.HyperLTL) {
                     isHyperLTL = true;
+                } else if (queryCategories.get(i) == TAPNQuery.QueryCategory.SMC) {
+                    isSmc = true;
                 }
             }
 
             // Update queryWrapper name and property
-            if (isCTL) {
+            if (isCTL && !isSmc) {
                 if (!XMLCTLQueryParser.parse(prop, queryWrapper)) {
                     queries.add(null);
                     continue;
@@ -155,6 +162,11 @@ public void warning(SAXParseException e) throws SAXException {}
                     queries.add(null);
                     continue;
                 }
+            } else if (isSmc) {
+                if (!XMLLTLQueryParser.parse(prop, queryWrapper)) {
+                    queries.add(null);
+                    continue;
+                }
             }
 
             // The number 9999 is the number of extra tokens allowed,
@@ -167,18 +179,24 @@ public void warning(SAXParseException e) throws SAXException {}
             RenameTemplateVisitor rt = new RenameTemplateVisitor("", 
                 network.activeTemplates().get(0).name());
 
-            query.setCategory(TAPNQueryLoader.detectCategory(queryWrapper.getProp(), isCTL, isLTL, isHyperLTL));
+            query.setCategory(TAPNQueryLoader.detectCategory(queryWrapper.getProp(), isCTL, isLTL, isHyperLTL, isSmc));
             
             if(query.getCategory() == TAPNQuery.QueryCategory.CTL || query.getCategory() == TAPNQuery.QueryCategory.LTL){
             	query.setSearchOption(SearchOption.DFS);
             	query.setUseReduction(true);
-            }
-
-            if(query.getCategory() == TAPNQuery.QueryCategory.HyperLTL) {
+            } else if(query.getCategory() == TAPNQuery.QueryCategory.HyperLTL) {
                 query.setSearchOption(SearchOption.DFS);
                 query.setTraceList(queryWrapper.getTraceList());
                 query.setUseStubbornReduction(false);
                 query.setUseReduction(false);
+            } else if(query.getCategory() == TAPNQuery.QueryCategory.SMC) {
+                query.setReductionOption(ReductionOption.VerifyDTAPN);
+                SMCSettings smcSettings = SMCSettings.Default();
+                if(hasSmcTag) {
+                    Element smcTag = (Element) ((Element) prop).getElementsByTagName("smc").item(0);
+                    smcSettings = TAPNQueryLoader.parseSmcSettings(smcTag);
+                }
+                query.setSmcSettings(smcSettings);
             }
             
             query.getProperty().accept(rt, null);
diff --git a/src/main/java/dk/aau/cs/model/tapn/ConstantProbability.java b/src/main/java/dk/aau/cs/model/tapn/ConstantProbability.java
new file mode 100644
index 000000000..fb59c3ed4
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/ConstantProbability.java
@@ -0,0 +1,53 @@
+package dk.aau.cs.model.tapn;
+
+import dk.aau.cs.util.Require;
+
+public class ConstantProbability extends Probability {
+    private Constant constant;
+
+    public ConstantProbability(Constant constant) {
+        Require.that(constant != null, "Argument must be a non-null constant");
+        this.constant = constant;
+    }
+
+    public double value() {
+        return (double) constant.value();
+    }
+
+    public Probability copy() {
+        return new ConstantProbability(constant.copy());
+    }
+
+    public Constant constant() {
+        return constant;
+    }
+
+    public void setConstant(Constant newConstant) {
+        Require.that(newConstant != null, "Constant cannot be null");
+
+        constant = newConstant;
+    }
+
+    public String toString() {
+        return constant.name();
+    }
+
+    public String toString(boolean displayConstantNames) {
+        if(displayConstantNames){
+            return constant.name();
+        } else if(constant.value() != 1){
+            return String.valueOf(constant.value());
+        } else {
+            return "";
+        }
+    }
+
+    public String nameForSaving(boolean writeConstantNames){
+        if(writeConstantNames){
+            return constant.name();
+        } else {
+            return Integer.toString(constant.value());
+        }
+
+    }
+}
diff --git a/src/main/java/dk/aau/cs/model/tapn/ConstantStore.java b/src/main/java/dk/aau/cs/model/tapn/ConstantStore.java
index d2df85fe6..6a1b59f27 100644
--- a/src/main/java/dk/aau/cs/model/tapn/ConstantStore.java
+++ b/src/main/java/dk/aau/cs/model/tapn/ConstantStore.java
@@ -36,6 +36,10 @@ public void buildConstraints(TimedArcPetriNetNetwork model) {
 				buildConstraints(place);
 			}
 
+            for (TimedTransition transition : tapn.transitions()) {
+                buildConstraints(transition);
+            }
+
 			for (TimedInputArc inputArc : tapn.inputArcs()) {
 				buildConstraints(inputArc);
 			}
@@ -86,6 +90,14 @@ private void buildConstraints(TimedPlace place) {
 		}
 	}
 
+    public void buildConstraints(TimedTransition transition) {
+        Probability weight = transition.getWeight();
+        if(weight instanceof ConstantProbability) {
+            Constant constant = ((ConstantProbability) weight).constant();
+            constant.setIsUsed(true);
+        }
+    }
+
 	public boolean containsConstantByName(String name) {
 		for(Constant c : constants) {
 			if(c.name().equals(name))
diff --git a/src/main/java/dk/aau/cs/model/tapn/DoubleProbability.java b/src/main/java/dk/aau/cs/model/tapn/DoubleProbability.java
new file mode 100644
index 000000000..bb01e27d7
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/DoubleProbability.java
@@ -0,0 +1,34 @@
+package dk.aau.cs.model.tapn;
+
+public class DoubleProbability extends Probability {
+
+    final double value;
+
+    public DoubleProbability(double value) {
+        this.value = value;
+    }
+
+    @Override
+    public double value() {
+        return value;
+    }
+
+    @Override
+    public Probability copy() {
+        return new DoubleProbability(value);
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    public String toString(boolean displayConstantNames) {
+        return toString();
+    }
+
+    public String nameForSaving(boolean writeConstantNames){
+        return Double.toString(value);
+    }
+}
+
diff --git a/src/main/java/dk/aau/cs/model/tapn/Probability.java b/src/main/java/dk/aau/cs/model/tapn/Probability.java
new file mode 100644
index 000000000..c89cb3c00
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/Probability.java
@@ -0,0 +1,23 @@
+package dk.aau.cs.model.tapn;
+
+public abstract class Probability {
+    public abstract double value();
+    public abstract Probability copy();
+    public abstract String toString(boolean displayConstantnames);
+    public abstract String nameForSaving(boolean writeConstantNames);
+
+    public static Probability parseProbability(String attribute, ConstantStore constants) {
+        Probability weight;
+        try{
+            double weightAsDouble = Double.parseDouble(attribute);
+            weight = new DoubleProbability(weightAsDouble);
+        } catch (NumberFormatException e){
+            if(constants.containsConstantByName(attribute)){
+                weight = new ConstantProbability(constants.getConstantByName(attribute));
+            } else {
+                throw new RuntimeException("A constant which was not declared was used in a transition weight");
+            }
+        }
+        return weight;
+    }
+}
diff --git a/src/main/java/dk/aau/cs/model/tapn/SMCConstantDistribution.java b/src/main/java/dk/aau/cs/model/tapn/SMCConstantDistribution.java
new file mode 100644
index 000000000..bb8d88677
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/SMCConstantDistribution.java
@@ -0,0 +1,39 @@
+package dk.aau.cs.model.tapn;
+
+import java.util.LinkedHashMap;
+
+public class SMCConstantDistribution extends SMCDistribution {
+
+    public static final String NAME = "constant";
+
+    public SMCConstantDistribution(double value) {
+        this.value = value;
+    }
+
+    @Override
+    public String distributionName() {
+        return NAME;
+    }
+
+    @Override
+    public LinkedHashMap<String, Double> getParameters() {
+        LinkedHashMap<String, Double> params = new LinkedHashMap<>();
+        params.put("value", value);
+        return params;
+    }
+
+    @Override
+    public String explanation() {
+        return
+            "<html>" +
+            "Will always choose the same specified value." +
+            "</html>";
+    }
+
+    public static SMCConstantDistribution defaultDistribution() {
+        return new SMCConstantDistribution(1);
+    }
+
+    public double value;
+
+}
\ No newline at end of file
diff --git a/src/main/java/dk/aau/cs/model/tapn/SMCDiscreteUniformDistribution.java b/src/main/java/dk/aau/cs/model/tapn/SMCDiscreteUniformDistribution.java
new file mode 100644
index 000000000..a98d831eb
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/SMCDiscreteUniformDistribution.java
@@ -0,0 +1,51 @@
+package dk.aau.cs.model.tapn;
+
+import java.util.LinkedHashMap;
+
+public class SMCDiscreteUniformDistribution extends SMCDistribution {
+
+    public static final String NAME = "discrete uniform";
+
+    public SMCDiscreteUniformDistribution(double a, double b) {
+        this.a = a;
+        this.b = b;
+        this.mean = (a + b) / 2.0;
+    }
+
+    @Override
+    public String distributionName() {
+        return NAME;
+    }
+
+    @Override
+    public LinkedHashMap<String, Double> getParameters() {
+        LinkedHashMap<String, Double> params = new LinkedHashMap<>();
+        params.put("a", a);
+        params.put("b", b);
+        return params;
+    }
+
+    @Override
+    public Double getMean() {
+        return mean;
+    }
+
+    @Override
+    public String explanation() {
+        return "<html>" +
+            "Will choose an integer point between<br/>" + 
+            "two numbers A and B (B included),<br/>" + 
+            "where every number has the same<br/>" + 
+            "probability of being chosen." +
+            "</html>";
+    }
+
+    public static SMCDiscreteUniformDistribution defaultDistribution() {
+        return new SMCDiscreteUniformDistribution(0, 10);
+    }
+
+    public double a;
+    public double b;
+
+    private final double mean;
+}
diff --git a/src/main/java/dk/aau/cs/model/tapn/SMCDistribution.java b/src/main/java/dk/aau/cs/model/tapn/SMCDistribution.java
new file mode 100644
index 000000000..d7f0981b9
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/SMCDistribution.java
@@ -0,0 +1,123 @@
+package dk.aau.cs.model.tapn;
+
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+
+public abstract class SMCDistribution {
+
+    public abstract String distributionName();
+
+    public abstract LinkedHashMap<String, Double> getParameters();
+
+    public abstract String explanation();
+
+    public Double getMean() {
+        return null;
+    }
+
+    public void writeToXml(Element target) {
+        target.setAttribute("distribution", distributionName());
+        for(HashMap.Entry<String, Double> entry : getParameters().entrySet()) {
+            target.setAttribute(entry.getKey(), entry.getValue().toString());
+        }
+    }
+
+    public String toString() {
+        StringBuilder res = new StringBuilder("distribution=\"" + distributionName() + "\" ");
+        for(HashMap.Entry<String, Double> entry : getParameters().entrySet()) {
+            res.append(entry.getKey()).append("=\"").append(entry.getValue().toString()).append("\" ");
+        }
+        return res.toString();
+    }
+
+    public String summary() {
+        StringBuilder res = new StringBuilder(distributionName() + "(");
+        LinkedList<String> params = new LinkedList<>();
+        for(HashMap.Entry<String, Double> entry : getParameters().entrySet()) {
+            params.add(entry.getValue().toString());
+        }
+        res.append(String.join(",", params));
+        res.append(")");
+        return res.toString();
+    }
+
+    public static SMCDistribution defaultDistribution() {
+        return SMCConstantDistribution.defaultDistribution();
+    }
+
+    public static SMCDistribution defaultDistributionFor(String name) {
+        switch (name) {
+            case SMCConstantDistribution.NAME:
+                return SMCConstantDistribution.defaultDistribution();
+            case SMCUniformDistribution.NAME:
+                return SMCUniformDistribution.defaultDistribution();
+            case SMCExponentialDistribution.NAME:
+                return SMCExponentialDistribution.defaultDistribution();
+            case SMCNormalDistribution.NAME:
+                return SMCNormalDistribution.defaultDistribution();
+            case SMCGammaDistribution.NAME:
+                return SMCGammaDistribution.defaultDistribution();
+            case SMCErlangDistribution.NAME:
+                return SMCErlangDistribution.defaultDistribution();
+            case SMCDiscreteUniformDistribution.NAME:
+                return SMCDiscreteUniformDistribution.defaultDistribution();
+            case SMCGeometricDistribution.NAME:
+                return SMCGeometricDistribution.defaultDistribution();
+            default:
+                return SMCDistribution.defaultDistribution();
+        }
+    }
+
+    public static SMCDistribution urgent() {
+        return new SMCConstantDistribution(0);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        return getParameters().equals(((SMCDistribution) o).getParameters());
+    }
+
+    public static SMCDistribution parseXml(Element elem) {
+        String type = elem.getAttribute("distribution");
+        try {
+            switch (type) {
+                case SMCConstantDistribution.NAME:
+                    double value = Double.parseDouble(elem.getAttribute("value"));
+                    return new SMCConstantDistribution(value);
+                case SMCUniformDistribution.NAME:
+                    double a = Double.parseDouble(elem.getAttribute("a"));
+                    double b = Double.parseDouble(elem.getAttribute("b"));
+                    return new SMCUniformDistribution(a, b);
+                case SMCExponentialDistribution.NAME:
+                    double rate = Double.parseDouble(elem.getAttribute("rate"));
+                    return new SMCExponentialDistribution(rate);
+                case SMCNormalDistribution.NAME:
+                    double mean = Double.parseDouble(elem.getAttribute("mean"));
+                    double stddev = Double.parseDouble(elem.getAttribute("stddev"));
+                    return new SMCNormalDistribution(mean, stddev);
+                case SMCGammaDistribution.NAME:
+                    double shape = Double.parseDouble(elem.getAttribute("shape"));
+                    double scale = Double.parseDouble(elem.getAttribute("scale"));
+                    return new SMCGammaDistribution(shape, scale);
+                case SMCErlangDistribution.NAME:
+                    double e_shape = Double.parseDouble(elem.getAttribute("shape"));
+                    double e_scale = Double.parseDouble(elem.getAttribute("scale"));
+                    return new SMCErlangDistribution(e_shape, e_scale);
+                case SMCDiscreteUniformDistribution.NAME:
+                    double da = Double.parseDouble(elem.getAttribute("a"));
+                    double db = Double.parseDouble(elem.getAttribute("b"));
+                    return new SMCDiscreteUniformDistribution(da,db);
+                case SMCGeometricDistribution.NAME:
+                    double p = Double.parseDouble(elem.getAttribute("p"));
+                    return new SMCGeometricDistribution(p);
+            }
+        } catch(NumberFormatException ignored) {}
+        return SMCDistribution.defaultDistribution();
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/dk/aau/cs/model/tapn/SMCErlangDistribution.java b/src/main/java/dk/aau/cs/model/tapn/SMCErlangDistribution.java
new file mode 100644
index 000000000..3011223cc
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/SMCErlangDistribution.java
@@ -0,0 +1,46 @@
+package dk.aau.cs.model.tapn;
+
+import java.util.LinkedHashMap;
+
+public class SMCErlangDistribution extends SMCDistribution {
+
+    public static final String NAME = "erlang";
+
+    public SMCErlangDistribution(double shape, double scale) {
+        this.shape = shape;
+        this.scale = scale;
+    }
+
+    @Override
+    public String distributionName() {
+        return NAME;
+    }
+
+    @Override
+    public LinkedHashMap<String, Double> getParameters() {
+        LinkedHashMap<String, Double> params = new LinkedHashMap<>();
+        params.put("shape", shape);
+        params.put("scale", scale);
+        return params;
+    }
+
+    @Override
+    public String explanation() {
+        return "<html>" +
+            "Erlang distribution <br/>" +
+            "</html>";
+    }
+
+    @Override
+    public Double getMean() {
+        return shape * scale;
+    }
+
+    public static SMCErlangDistribution defaultDistribution() {
+        return new SMCErlangDistribution(1, 1);
+    }
+
+    public double shape;
+    public double scale;
+
+}
diff --git a/src/main/java/dk/aau/cs/model/tapn/SMCExponentialDistribution.java b/src/main/java/dk/aau/cs/model/tapn/SMCExponentialDistribution.java
new file mode 100644
index 000000000..aaeecf652
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/SMCExponentialDistribution.java
@@ -0,0 +1,48 @@
+package dk.aau.cs.model.tapn;
+
+import java.util.LinkedHashMap;
+
+public class SMCExponentialDistribution extends SMCDistribution {
+
+    public static final String NAME = "exponential";
+
+    public SMCExponentialDistribution(double rate) {
+        this.rate = rate;
+        this.mean = 1.0 / rate;
+    }
+
+    @Override
+    public String distributionName() {
+        return NAME;
+    }
+
+    @Override
+    public LinkedHashMap<String, Double> getParameters() {
+        LinkedHashMap<String, Double> params = new LinkedHashMap<>();
+        params.put("rate", rate);
+        return params;
+    }
+
+    @Override
+    public Double getMean() {
+        return mean;
+    }
+
+    @Override
+    public String explanation() {
+        return "<html>" +
+            "Memoryless distribution, <br/>" +
+            "probability of the distance between events <br/>" +
+            "occurring according to a real rate." +
+            "</html>";
+    }
+
+    public static SMCExponentialDistribution defaultDistribution() {
+        return new SMCExponentialDistribution(0.1);
+    }
+
+    public double rate;
+
+    private final double mean;
+
+}
\ No newline at end of file
diff --git a/src/main/java/dk/aau/cs/model/tapn/SMCGammaDistribution.java b/src/main/java/dk/aau/cs/model/tapn/SMCGammaDistribution.java
new file mode 100644
index 000000000..bd096227b
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/SMCGammaDistribution.java
@@ -0,0 +1,46 @@
+package dk.aau.cs.model.tapn;
+
+import java.util.LinkedHashMap;
+
+public class SMCGammaDistribution extends SMCDistribution {
+
+    public static final String NAME = "gamma";
+
+    public SMCGammaDistribution(double shape, double scale) {
+        this.shape = shape;
+        this.scale = scale;
+    }
+
+    @Override
+    public String distributionName() {
+        return NAME;
+    }
+
+    @Override
+    public LinkedHashMap<String, Double> getParameters() {
+        LinkedHashMap<String, Double> params = new LinkedHashMap<>();
+        params.put("shape", shape);
+        params.put("scale", scale);
+        return params;
+    }
+
+    @Override
+    public String explanation() {
+        return "<html>" +
+            "Gamma distribution" +
+            "</html>";
+    }
+
+    @Override
+    public Double getMean() {
+        return shape * scale;
+    }
+
+    public static SMCGammaDistribution defaultDistribution() {
+        return new SMCGammaDistribution(1, 1);
+    }
+
+    public double shape;
+    public double scale;
+
+}
diff --git a/src/main/java/dk/aau/cs/model/tapn/SMCGeometricDistribution.java b/src/main/java/dk/aau/cs/model/tapn/SMCGeometricDistribution.java
new file mode 100644
index 000000000..93c4660a1
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/SMCGeometricDistribution.java
@@ -0,0 +1,45 @@
+package dk.aau.cs.model.tapn;
+
+import java.util.LinkedHashMap;
+
+public class SMCGeometricDistribution extends SMCDistribution {
+
+    public static final String NAME = "geometric";
+
+    public SMCGeometricDistribution(double p) {
+        this.p = p;
+    }
+
+    @Override
+    public String distributionName() {
+        return NAME;
+    }
+
+    @Override
+    public LinkedHashMap<String, Double> getParameters() {
+        LinkedHashMap<String, Double> params = new LinkedHashMap<>();
+        params.put("p", p);
+        return params;
+    }
+
+    @Override
+    public String explanation() {
+        return "<html>" +
+            "Geometric distribution <br/>" +
+            "Model the number of trials needed to obtain on success <br/>" +
+            "from successive Bernoulli trials of probability P" +
+            "</html>";
+    }
+
+    @Override
+    public Double getMean() {
+        return 1 / p;
+    }
+
+    public static SMCGeometricDistribution defaultDistribution() {
+        return new SMCGeometricDistribution(0.5);
+    }
+
+    public double p;
+
+}
diff --git a/src/main/java/dk/aau/cs/model/tapn/SMCNormalDistribution.java b/src/main/java/dk/aau/cs/model/tapn/SMCNormalDistribution.java
new file mode 100644
index 000000000..95c41aef2
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/SMCNormalDistribution.java
@@ -0,0 +1,48 @@
+package dk.aau.cs.model.tapn;
+
+import java.util.LinkedHashMap;
+
+public class SMCNormalDistribution extends SMCDistribution {
+
+    public static final String NAME = "normal";
+
+    public SMCNormalDistribution(double mean, double stddev) {
+        this.mean = mean;
+        this.stddev = stddev;
+    }
+
+    @Override
+    public String distributionName() {
+        return NAME;
+    }
+
+    @Override
+    public LinkedHashMap<String, Double> getParameters() {
+        LinkedHashMap<String, Double> params = new LinkedHashMap<>();
+        params.put("mean", mean);
+        params.put("stddev", stddev);
+        return params;
+    }
+
+    @Override
+    public Double getMean() {
+        return mean;
+    }
+
+    @Override
+    public String explanation() {
+        return "<html>" +
+            "Gaussian distribution, centered around <br/>" + 
+            "a real MEAN, and spread according to <br/>" + 
+            "a standard deviation STDDEV." +
+            "</html>";
+    }
+
+    public static SMCNormalDistribution defaultDistribution() {
+        return new SMCNormalDistribution(1, 1);
+    }
+
+    public double mean;
+    public double stddev;
+
+}
diff --git a/src/main/java/dk/aau/cs/model/tapn/SMCUniformDistribution.java b/src/main/java/dk/aau/cs/model/tapn/SMCUniformDistribution.java
new file mode 100644
index 000000000..c16957c35
--- /dev/null
+++ b/src/main/java/dk/aau/cs/model/tapn/SMCUniformDistribution.java
@@ -0,0 +1,50 @@
+package dk.aau.cs.model.tapn;
+
+import java.util.LinkedHashMap;
+
+public class SMCUniformDistribution extends SMCDistribution {
+
+    public static final String NAME = "uniform";
+
+    public SMCUniformDistribution(double a, double b) {
+        this.a = a;
+        this.b = b;
+        this.mean = (a + b) / 2.0;
+    }
+
+    @Override
+    public String distributionName() {
+        return NAME;
+    }
+
+    @Override
+    public LinkedHashMap<String, Double> getParameters() {
+        LinkedHashMap<String, Double> params = new LinkedHashMap<>();
+        params.put("a", a);
+        params.put("b", b);
+        return params;
+    }
+
+    @Override
+    public Double getMean() {
+        return mean;
+    }
+
+    @Override
+    public String explanation() {
+        return "<html>" +
+            "Will choose a point between two reals <br/>" + 
+            "A and B, where every number has the <br/>" + 
+            "same probability of being chosen." +
+            "</html>";
+    }
+
+    public static SMCUniformDistribution defaultDistribution() {
+        return new SMCUniformDistribution(0, 10);
+    }
+
+    public double a;
+    public double b;
+
+    private final double mean;
+}
\ No newline at end of file
diff --git a/src/main/java/dk/aau/cs/model/tapn/SharedTransition.java b/src/main/java/dk/aau/cs/model/tapn/SharedTransition.java
index b2c6b61ac..74649fbd6 100644
--- a/src/main/java/dk/aau/cs/model/tapn/SharedTransition.java
+++ b/src/main/java/dk/aau/cs/model/tapn/SharedTransition.java
@@ -6,10 +6,10 @@
 import java.util.regex.Pattern;
 
 import dk.aau.cs.model.CPN.Expressions.GuardExpression;
+import dk.aau.cs.model.tapn.simulation.FiringMode;
+import dk.aau.cs.model.tapn.simulation.OldestFiringMode;
 import dk.aau.cs.util.IntervalOperations;
 import dk.aau.cs.util.Require;
-import net.tapaal.gui.petrinet.Template;
-import pipe.gui.TAPAALGUI;
 
 public class SharedTransition {
 	private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
@@ -18,6 +18,9 @@ public class SharedTransition {
 	private final List<TimedTransition> transitions = new ArrayList<TimedTransition>();
 	private boolean isUrgent = false;
 	private boolean isUncontrollable = false;
+    private SMCDistribution distribution = SMCDistribution.defaultDistribution();
+    private Probability weight = new DoubleProbability(1.0);
+	private FiringMode firingMode = new OldestFiringMode();
 	private GuardExpression guard = null;
 
 	private TimedArcPetriNetNetwork network;
@@ -40,6 +43,9 @@ public boolean isUrgent(){
 	
 	public void setUrgent(boolean value){
 		isUrgent = value;
+        if(isUrgent) {
+            setDistribution(SMCDistribution.urgent());
+        }
 		for(TimedTransition t : transitions){
 			t.setUrgent(value, false);
 		}
@@ -56,6 +62,39 @@ public void setUncontrollable(boolean isUncontrollable) {
         }
     }
 
+    public SMCDistribution getDistribution() { return distribution; }
+
+    public void setDistribution(SMCDistribution distribution) {
+        this.distribution = distribution;
+        for (TimedTransition transition : transitions) {
+            transition.setDistribution(distribution, false);
+        }
+    }
+
+    public Probability getWeight() { return weight; }
+
+    public void setWeight(Probability weight) {
+        this.weight = weight;
+        for (TimedTransition transition : transitions) {
+            transition.setWeight(weight, false);
+        }
+    }
+
+	public void setFiringMode(FiringMode firingMode) {
+		this.firingMode = firingMode;
+		for (TimedTransition transition : transitions) {
+			transition.setFiringMode(firingMode);
+		}
+	}
+
+	public FiringMode getFiringMode() {
+		return firingMode;
+	}
+
+    public boolean hasCustomDistribution() {
+        return !this.distribution.equals(SMCDistribution.defaultDistribution());
+    }
+
     public GuardExpression getGuard() {
         return guard;
     }
@@ -63,9 +102,9 @@ public GuardExpression getGuard() {
     public void setGuard(GuardExpression guard) {
         this.guard = guard;
         for (TimedTransition transition : transitions) {
-            if(guard != null){
+            if(guard != null) {
                 transition.setGuard(guard.copy(), false);
-            } else{
+            } else {
                 transition.setGuard(null, false);
             }
         }
@@ -75,7 +114,7 @@ public void setName(String newName) {
 		Require.that(newName != null && !newName.isEmpty(), "A timed transition must have a name");
 		Require.that(isValid(newName), "The specified name must conform to the pattern [a-zA-Z_][a-zA-Z0-9_]*");
 		name = newName;
-		for(TimedTransition transition : transitions){
+		for(TimedTransition transition : transitions) {
 			transition.setName(newName);
 		}
 	}
diff --git a/src/main/java/dk/aau/cs/model/tapn/TAPNQuery.java b/src/main/java/dk/aau/cs/model/tapn/TAPNQuery.java
index 6623f7218..cf2a8890e 100644
--- a/src/main/java/dk/aau/cs/model/tapn/TAPNQuery.java
+++ b/src/main/java/dk/aau/cs/model/tapn/TAPNQuery.java
@@ -3,6 +3,7 @@
 import dk.aau.cs.TCTL.*;
 import dk.aau.cs.TCTL.visitors.HasDeadlockVisitor;
 import dk.aau.cs.verification.QueryType;
+import dk.aau.cs.verification.SMCSettings;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.QueryCategory;
 
 import java.util.ArrayList;
@@ -12,6 +13,7 @@ public class TAPNQuery {
 	private int extraTokens = 0;
 	private QueryCategory queryCategory = QueryCategory.Default;
 	private ArrayList<String> traceList;
+    private SMCSettings smcSettings;
 
 	public TCTLAbstractProperty getProperty() {
 		return property;
@@ -20,8 +22,15 @@ public TCTLAbstractProperty getProperty() {
 	public TAPNQuery(TCTLAbstractProperty inputProperty, int extraTokens) {
 		property = inputProperty;
 		this.extraTokens = extraTokens;
+        smcSettings = SMCSettings.Default();
 	}
 
+    public TAPNQuery(TCTLAbstractProperty inputProperty, int extraTokens, SMCSettings smcSettings) {
+        property = inputProperty;
+        this.extraTokens = extraTokens;
+        this.smcSettings = smcSettings;
+    }
+
 	public int getExtraTokens() {
 		return extraTokens;
 	}
@@ -30,6 +39,8 @@ public QueryType queryType() {
 		if (property instanceof TCTLEFNode) return QueryType.EF;
 		else if (property instanceof TCTLEGNode) return QueryType.EG;
 		else if (property instanceof TCTLAFNode) return QueryType.AF;
+        else if(queryCategory == QueryCategory.SMC && property instanceof LTLFNode) return QueryType.PF;
+        else if(queryCategory == QueryCategory.SMC && property instanceof LTLGNode) return QueryType.PG;
 		else if (property instanceof LTLENode) return  QueryType.E;
 		else if (property instanceof LTLANode) return QueryType.A;
         else return QueryType.AG;
@@ -63,5 +74,13 @@ public void setTraceList(ArrayList<String> traces) {
     public ArrayList<String> getTraceList() {
 	    return this.traceList;
     }
+
+    public void setSMCSettings(SMCSettings settings) {
+        smcSettings = settings;
+    }
+
+    public SMCSettings getSMCSettings() {
+        return smcSettings;
+    }
 }
 
diff --git a/src/main/java/dk/aau/cs/model/tapn/TimedArcPetriNet.java b/src/main/java/dk/aau/cs/model/tapn/TimedArcPetriNet.java
index dc87898f4..f51c92997 100644
--- a/src/main/java/dk/aau/cs/model/tapn/TimedArcPetriNet.java
+++ b/src/main/java/dk/aau/cs/model/tapn/TimedArcPetriNet.java
@@ -10,6 +10,7 @@
 import dk.aau.cs.model.tapn.Bound.InfBound;
 import dk.aau.cs.util.IntervalOperations;
 import dk.aau.cs.util.Require;
+import net.tapaal.gui.petrinet.TAPNLens;
 
 public class TimedArcPetriNet {
 	private String name;
@@ -108,6 +109,15 @@ public boolean isColored(){
 	    return false;
     }
 
+    public boolean isStochastic() {
+        for(TimedTransition t : transitions) {
+            if(t.hasCustomDistribution()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 	public void add(TimedTransition transition) {
 		Require.that(transition != null, "Argument must be a non-null transition");
 		Require.that(!isNameUsed(transition.name()) || transition.isShared(), "A place or transition with the specified name, "+transition.name()+", already exists in the petri net.");
@@ -454,6 +464,9 @@ private void fillStatistics(Iterable<TimedArcPetriNet> nets, Object[][] array, i
         int numberOfOrphanPlaces = 0;
 		boolean networkUntimed = true;
 		boolean networkWeighted = false; 
+        boolean isGame = hasUncontrollableTransitions();
+        boolean isColored = isColored();
+        boolean isStochastic = isStochastic();
 		int numberOfUntimedInputArcs = 0;
 		int numberOfUntimedTransportArcs = 0;
                 
@@ -574,13 +587,16 @@ private void fillStatistics(Iterable<TimedArcPetriNet> nets, Object[][] array, i
 		rowNumber += 2;
 		array[rowNumber++][columnNumber] = networkUntimed ? "yes" : "no";
 		array[rowNumber++][columnNumber] = networkWeighted ? "yes" : "no";
+        array[rowNumber++][columnNumber] = isGame ? "yes" : "no";
+        array[rowNumber++][columnNumber] = isColored ? "yes" : "no";
+        array[rowNumber++][columnNumber] = isStochastic ? "yes" : "no";
         array[rowNumber++][columnNumber] = numberOfOrphanTransitions;
         array[rowNumber++][columnNumber] = numberOfOrphanPlaces;
 	}
 	
 	public Object[][] getStatistics(){
 		
-		Object[][] result = new Object[17][4];
+		Object[][] result = new Object[20][4];
 		int rowNumber = 0;
 		int columnNumber = 0;
 		result[rowNumber++][columnNumber] = "Number of components considered: ";
@@ -598,6 +614,9 @@ public Object[][] getStatistics(){
 		result[rowNumber++][columnNumber] = "Number of shared transitions: ";
 		result[rowNumber++][columnNumber] = "The network is untimed: ";
 		result[rowNumber++][columnNumber] = "The network is weighted: ";
+        result[rowNumber++][columnNumber] = "The network is game: ";
+        result[rowNumber++][columnNumber] = "The network is colored: ";
+        result[rowNumber++][columnNumber] = "The network is stochastic: ";
 		result[rowNumber++][columnNumber] = "Number of orphan transitions: ";
         result[rowNumber++][columnNumber] = "Number of orphan places: ";
 
diff --git a/src/main/java/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java b/src/main/java/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java
index f027743c9..1c895ca44 100644
--- a/src/main/java/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java
+++ b/src/main/java/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java
@@ -244,6 +244,10 @@ public void updateGuardsAndWeightsWithNewConstant(String oldName, Constant newCo
 				updatePlaceInvariant(oldName, newConstant, place);
 			}
 
+            for (TimedTransition transition : tapn.transitions()) {
+                updateProbability(oldName, newConstant, transition.getWeight());
+            }
+
 			for (TimedInputArc inputArc : tapn.inputArcs()) {
 				updateTimeIntervalAndWeight(oldName, newConstant, inputArc.interval(), inputArc.getWeight());
 			}
@@ -294,6 +298,15 @@ private void updateWeight(String oldName, Constant newConstant, Weight weight) {
 		
 	}
 
+    private void updateProbability(String oldName, Constant newConstant, Probability probability) {
+        if(probability instanceof  ConstantProbability) {
+            ConstantProbability cp = (ConstantProbability) probability;
+            if(cp.constant().name().equals(oldName)) {
+                cp.setConstant(newConstant);
+            }
+        }
+    }
+
 	public Collection<Constant> constants() {
 		return constants.getConstants();
 	}
@@ -458,6 +471,15 @@ public boolean isColored() {
 	    return colorTypes.size() > 1 || variables.size() > 0;
     }
 
+    public boolean isStochastic() {
+        for (TimedArcPetriNet tapn : tapns) {
+            if(tapn.isStochastic()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 	public boolean isUntimed(){
 		for(TimedArcPetriNet t : tapns){
 			if(!t.isUntimed()){
diff --git a/src/main/java/dk/aau/cs/model/tapn/TimedTransition.java b/src/main/java/dk/aau/cs/model/tapn/TimedTransition.java
index e537a6897..9c5ba1ee1 100644
--- a/src/main/java/dk/aau/cs/model/tapn/TimedTransition.java
+++ b/src/main/java/dk/aau/cs/model/tapn/TimedTransition.java
@@ -1,19 +1,20 @@
 package dk.aau.cs.model.tapn;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
 import dk.aau.cs.model.CPN.ColorType;
 import dk.aau.cs.model.CPN.ColoredTimeInterval;
 import dk.aau.cs.model.CPN.Expressions.GuardExpression;
+import dk.aau.cs.model.tapn.simulation.OldestFiringMode;
 import pipe.gui.petrinet.animation.Animator;
 
 import dk.aau.cs.model.tapn.Bound.InfBound;
 import dk.aau.cs.model.tapn.event.TimedTransitionEvent;
 import dk.aau.cs.model.tapn.event.TimedTransitionListener;
 import dk.aau.cs.model.tapn.simulation.FiringMode;
+import dk.aau.cs.model.tapn.simulation.OldestFiringMode;
 import dk.aau.cs.util.IntervalOperations;
 import dk.aau.cs.util.Require;
 
@@ -28,6 +29,9 @@ public class TimedTransition extends TAPNElement {
 
 	private boolean isUrgent = false;
 	private boolean isUncontrollable = false;
+    private SMCDistribution distribution = SMCDistribution.defaultDistribution();
+    private Probability weight = new DoubleProbability(1.0);
+	private FiringMode firingMode = new OldestFiringMode();
     private GuardExpression guard;
 
 	private SharedTransition sharedTransition;
@@ -48,6 +52,22 @@ public TimedTransition(String name, boolean isUrgent, GuardExpression guard) {
 		this.guard = guard;
 	}
 
+    public TimedTransition(String name, boolean isUrgent, GuardExpression guard, SMCDistribution distribution) {
+        setName(name);
+        setUrgent(isUrgent);
+        setDistribution(distribution);
+        this.guard = guard;
+    }
+
+    public TimedTransition(String name, boolean isUrgent, GuardExpression guard, SMCDistribution distribution, Probability weight, FiringMode firingMode) {
+        setName(name);
+        setUrgent(isUrgent);
+        setDistribution(distribution);
+        setWeight(weight);
+		setFiringMode(firingMode);
+        this.guard = guard;
+    }
+
 	public void addTimedTransitionListener(TimedTransitionListener listener){
 		Require.that(listener != null, "listener cannot be null");
 		listeners.add(listener);
@@ -68,6 +88,9 @@ public void setUrgent(boolean value){
 	
 	protected void setUrgent(boolean value, boolean cascade){
 		isUrgent = value;
+        if (isUrgent) {
+            setDistribution(SMCDistribution.urgent());
+        }
 		if(isShared() && cascade){
 			sharedTransition.setUrgent(value);
 		}
@@ -87,6 +110,44 @@ public void setUncontrollable(boolean isUncontrollable, boolean cascade) {
 	        sharedTransition.setUncontrollable(isUncontrollable);
         }
     }
+
+    public SMCDistribution getDistribution() { return distribution; }
+
+    public void setDistribution(SMCDistribution distrib) { setDistribution(distrib, true); }
+
+    public void setDistribution(SMCDistribution distrib, boolean cascade) {
+        this.distribution = distrib;
+        if(isShared() && cascade) {
+            sharedTransition.setDistribution(distrib);
+        }
+    }
+
+    public Probability getWeight() { return weight; }
+
+    public void setWeight(Probability weight) { setWeight(weight, true); }
+
+    public void setWeight(Probability weight, boolean cascade) {
+        this.weight = weight;
+        if(isShared() && cascade) {
+            sharedTransition.setWeight(weight);
+        }
+    }
+
+	public void setFiringMode(FiringMode firingMode) {
+		this.firingMode = firingMode;
+	}
+
+	public FiringMode getFiringMode() {
+        if (firingMode == null) {
+            firingMode = new OldestFiringMode();
+        }
+        
+        return firingMode;
+	}
+
+    public boolean hasCustomDistribution() {
+        return !this.distribution.equals(SMCDistribution.defaultDistribution());
+    }
 	
 	public boolean hasUntimedPreset(){
 		return hasUntimedPreset(true);
@@ -403,9 +464,9 @@ public List<TimedInhibitorArc> getInhibitorArcs() {
 
 	public TimedTransition copy() {
 	    if(guard == null){
-            return new TimedTransition(name, isUrgent, null);
+            return new TimedTransition(name, isUrgent, null, distribution, weight, firingMode);
         }
-		return new TimedTransition(name, isUrgent, guard.copy());
+		return new TimedTransition(name, isUrgent, guard.copy(), distribution, weight, firingMode);
 	}
 
 	@Override
diff --git a/src/main/java/dk/aau/cs/verification/QuantitativeResult.java b/src/main/java/dk/aau/cs/verification/QuantitativeResult.java
new file mode 100644
index 000000000..535d018d6
--- /dev/null
+++ b/src/main/java/dk/aau/cs/verification/QuantitativeResult.java
@@ -0,0 +1,20 @@
+package dk.aau.cs.verification;
+
+public class QuantitativeResult {
+    private float smcEstimation;
+    private float smcEstimationWidth;
+
+    public QuantitativeResult(float smcEstimation, float smcEstimationWidth) {
+        this.smcEstimation = smcEstimation;
+        this.smcEstimationWidth = smcEstimationWidth;
+    }
+
+    @Override
+    public String toString() {
+        return "The estimated probability of the property holding is " + smcEstimation + " ± " + smcEstimationWidth;
+    }
+
+    public String getProbabilityString() {
+        return "P = " + smcEstimation + " ± " + smcEstimationWidth;
+    }
+}
diff --git a/src/main/java/dk/aau/cs/verification/QueryResult.java b/src/main/java/dk/aau/cs/verification/QueryResult.java
index 35a978d91..fdeb05b78 100644
--- a/src/main/java/dk/aau/cs/verification/QueryResult.java
+++ b/src/main/java/dk/aau/cs/verification/QueryResult.java
@@ -5,6 +5,7 @@
 
 public class QueryResult {
 	private final boolean satisfied;
+    private final QuantitativeResult quantitativeResult;
 	private boolean approximationInconclusive = false;
 	private final boolean discreteInclusion;
 	private final TAPNQuery query;
@@ -44,7 +45,16 @@ public QueryResult(boolean satisfied, BoundednessAnalysisResult boundednessAnaly
 		this.boundednessAnalysis = boundednessAnalysis;
 		this.query = query;
 		this.discreteInclusion = discreteInclusion;
+        this.quantitativeResult = null;
 	}
+
+    public QueryResult(QuantitativeResult quantitativeResult, BoundednessAnalysisResult boundednessAnalysis, TAPNQuery query, boolean discreteInclusion){
+        this.satisfied = true;
+        this.boundednessAnalysis = boundednessAnalysis;
+        this.query = query;
+        this.discreteInclusion = discreteInclusion;
+        this.quantitativeResult = quantitativeResult;
+    }
 	
 	public boolean isQuerySatisfied() {
 		return satisfied;
@@ -71,10 +81,12 @@ public String toString() {
 		StringBuilder buffer = new StringBuilder();
 		if(approximationInconclusive)
 			buffer.append(getInconclusiveString());
-		else {
+		else if(this.quantitativeResult == null) {
 			buffer.append("Property is ");
 			buffer.append(satisfied ? "satisfied." : "not satisfied.");
-		}
+		} else {
+            buffer.append(quantitativeResult);
+        }
 		if(shouldAddExplanation())
 			buffer.append(getExplanationString());
 		return buffer.toString();
@@ -91,6 +103,7 @@ private boolean shouldAddExplanation() {
 		|| (queryType().equals(QueryType.AG) && isQuerySatisfied())
         || (queryType().equals(QueryType.A))
         || (queryType().equals(QueryType.E))
+        || (isSMC())
 		|| (hasDeadlock() && 
 				(!isQuerySatisfied() && queryType().equals(QueryType.EF)) || 
 				(isQuerySatisfied() && queryType().equals(QueryType.AG))
@@ -98,7 +111,26 @@ private boolean shouldAddExplanation() {
 	}
 	
 	protected String getExplanationString(){
-		return boundednessAnalysis.toString();
+        if(isSMC()) {
+            String timeBound = query.getSMCSettings().timeBound < Integer.MAX_VALUE ?
+                String.valueOf(query.getSMCSettings().timeBound) : "&infin;";
+            String stepBound = query.getSMCSettings().stepBound < Integer.MAX_VALUE ?
+                String.valueOf(query.getSMCSettings().stepBound) : "&infin;";
+            return  "<br/>" +
+                    "<br/>The engine explored runs satisfying: " +
+                    "time " + " &le; " + timeBound + " and " +
+                    "steps " + "&le; " + stepBound +
+                    ((isQuantitative()) ?
+                        "<br/>Confidence level: " + (query.getSMCSettings().confidence * 100) + "%" :
+                        (query.getSMCSettings().compareToFloat) ?
+                        "<br/>Probability of false positive: " + query.getSMCSettings().falsePositives +
+                        "<br/>Probability of false negative: " + query.getSMCSettings().falseNegatives +
+                        "<br/>Indifference region: [" + (query.getSMCSettings().geqThan - query.getSMCSettings().indifferenceWidth) +
+                        ";" +  (query.getSMCSettings().geqThan + query.getSMCSettings().indifferenceWidth) + "]" : ""
+                    );
+        } else {
+            return boundednessAnalysis.toString();
+        }
 	}
 	
 	protected String getInconclusiveString(){
@@ -112,4 +144,16 @@ public BoundednessAnalysisResult boundednessAnalysis() {
     public TAPNQuery getQuery() {
         return query;
     }
+
+    public boolean isSMC() {
+        return query.getCategory() == net.tapaal.gui.petrinet.verification.TAPNQuery.QueryCategory.SMC;
+    }
+
+    public boolean isQuantitative() {
+        return quantitativeResult != null;
+    }
+
+    public String getProbabilityString() {
+        return quantitativeResult.getProbabilityString();
+    }
 }
diff --git a/src/main/java/dk/aau/cs/verification/QueryType.java b/src/main/java/dk/aau/cs/verification/QueryType.java
index e812ae451..e48f39c6d 100644
--- a/src/main/java/dk/aau/cs/verification/QueryType.java
+++ b/src/main/java/dk/aau/cs/verification/QueryType.java
@@ -6,5 +6,7 @@ public enum QueryType {
 	AF,
 	AG,
     E,
-    A
+    A,
+    PF,
+    PG
 }
diff --git a/src/main/java/dk/aau/cs/verification/SMCResultPanel.java b/src/main/java/dk/aau/cs/verification/SMCResultPanel.java
new file mode 100644
index 000000000..7defc65ca
--- /dev/null
+++ b/src/main/java/dk/aau/cs/verification/SMCResultPanel.java
@@ -0,0 +1,229 @@
+package dk.aau.cs.verification;
+
+import dk.aau.cs.model.tapn.simulation.TAPNNetworkTrace;
+import dk.aau.cs.util.MemoryMonitor;
+import net.tapaal.swinghelpers.GridBagHelper;
+import pipe.gui.graph.Graph;
+import pipe.gui.graph.GraphDialog;
+import pipe.gui.graph.GraphPoint;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.List;
+
+import static net.tapaal.swinghelpers.GridBagHelper.Anchor.WEST;
+
+public class SMCResultPanel extends JPanel  {
+
+    public SMCResultPanel(final VerificationResult<TAPNNetworkTrace> result) {
+        setLayout(new GridBagLayout());
+        boolean quantitative = result.getQueryResult().isQuantitative();
+        SMCStats stats = (SMCStats) result.getStats();
+
+        JPanel resultPanel = createResultPanel(result.getQueryResult(), stats);
+        JPanel statsPanel = createStatsPanel(stats, quantitative);
+
+        JPanel estimates = new JPanel(new GridBagLayout());
+        GridBagConstraints gbc = GridBagHelper.as(0, 0, WEST);
+        gbc.weightx = 1;
+        gbc.fill = GridBagConstraints.NONE;
+        estimates.add(new JLabel(result.getVerificationTimeString()), gbc);
+        gbc = GridBagHelper.as(0, 1, WEST);
+        estimates.add(new JLabel("Estimated memory usage: "+ MemoryMonitor.getPeakMemory()), gbc);
+        if (result.getRawOutput() != null) {
+            JButton showRawQueryButton = new JButton("Show raw query results");
+            showRawQueryButton.addActionListener(arg0 -> JOptionPane.showMessageDialog(this, createRawQueryPanel(result.getRawOutput()), "Raw query results", JOptionPane.INFORMATION_MESSAGE));
+            estimates.add(showRawQueryButton, GridBagHelper.as(1,0, GridBagHelper.Anchor.EAST));
+        }
+
+        gbc = GridBagHelper.as(0, 0);
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        add(resultPanel, gbc);
+        gbc.gridy++;
+        add(statsPanel, gbc);
+        gbc.gridy++;
+        gbc.anchor = GridBagConstraints.WEST;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        gbc.insets = new Insets(30,0,0,0);
+        add(estimates, gbc);
+    }
+
+    private JPanel createResultPanel(QueryResult result, SMCStats stats) {
+        JPanel resultPanel = new JPanel(new GridBagLayout());
+        GridBagConstraints gbc = GridBagHelper.as(0, 0, new Insets(20, 20, 20, 20));
+        resultPanel.setBorder(BorderFactory.createTitledBorder("Query result"));
+        resultPanel.add(new JLabel("<html>" + result.toString() + "</html>"), gbc);
+
+        java.util.List<Graph> graphs = new ArrayList<>();
+
+        java.util.List<GraphPoint> cumulativeDelayPoints = stats.getCumulativeDelayPoints();
+        if (!cumulativeDelayPoints.isEmpty()) {
+            graphs.add(new Graph("Cumulative Probability / Delay", cumulativeDelayPoints, "Time", "Cumulative Probability", "Delay"));
+        }
+
+        List<GraphPoint> cumulativeStepPoints = stats.getCumulativeStepPoints();
+        if (!cumulativeStepPoints.isEmpty()) {
+            graphs.add(new Graph("Cumulative Probability / Step", cumulativeStepPoints, "Number of Steps", "Cumulative Probability", "Step"));
+        }
+
+        if (!graphs.isEmpty()) {
+            GraphDialog.GraphDialogBuilder builder = new GraphDialog.GraphDialogBuilder();
+            GraphDialog graphFrame = builder.addGraphs(graphs).setTitle("SMC Statistics").build();
+
+            String btnText = "Plot cumulative statistics";
+
+            JButton showGraphButton = new JButton(btnText);
+            gbc = GridBagHelper.as(1, 0, WEST, new Insets(0,0,10,0));
+            resultPanel.add(showGraphButton, gbc);
+            showGraphButton.addActionListener(arg0 -> graphFrame.display());
+        }
+
+        return resultPanel;
+    }
+
+    private JPanel createStatsPanel(SMCStats stats, boolean printRunsStats) {
+        DecimalFormatSymbols decimalFormatSymbols = DecimalFormatSymbols.getInstance();
+        decimalFormatSymbols.setDecimalSeparator('.');
+        DecimalFormat verifTimeFormat = new DecimalFormat("#.######", decimalFormatSymbols);
+        JPanel statsPanel = new JPanel(new GridBagLayout());
+        statsPanel.setBorder(BorderFactory.createTitledBorder("Statistics"));
+        JPanel validRunsPanel = new JPanel(new GridBagLayout());
+        JPanel violatingRunsPanel = new JPanel(new GridBagLayout());
+
+        GridBagConstraints gbc = GridBagHelper.as(0,0, GridBagHelper.Anchor.WEST, new Insets(10, 0, 10, 30));
+        JPanel generalStatsPanel = new JPanel(new GridBagLayout());
+        addStatIfPositive(generalStatsPanel, "Executed runs: ", stats.getExecutedRuns(), gbc);
+        addStatIfPositive(generalStatsPanel, "Average simulation time per run (ms): ", (1000.0 * stats.getVerificationTime()) / stats.getExecutedRuns(), gbc, verifTimeFormat);
+        gbc.gridy = 0;
+        gbc.gridx = 3;
+        addAvgStdDev(generalStatsPanel, "Average run duration: ", stats.getAverageRunTime(), stats.getRunTimeStdDev(), gbc);
+        addAvgStdDev(generalStatsPanel, "Average run length: ", stats.getAverageRunLength(), stats.getRunLengthStdDev(), gbc);
+
+        gbc = GridBagHelper.as(0,0);
+        statsPanel.add(generalStatsPanel, gbc);
+
+        validRunsPanel.setBorder(BorderFactory.createTitledBorder("Valid runs satisfying the property"));
+        gbc = GridBagHelper.as(0,0, GridBagHelper.Anchor.WEST, new Insets(5, 5, 5, 5));
+        if(stats.getValidRuns() == 0) {
+            validRunsPanel.add(new JLabel("No valid run"), gbc);
+        } else {
+            addStatIfPositive(validRunsPanel, "Number: ", stats.getValidRuns(), gbc);
+            addAvgStdDev(validRunsPanel, "Average duration: ", stats.getValidRunAverageTime(), stats.getValidRunTimeStdDev(), gbc);
+            addAvgStdDev(validRunsPanel, "Average length: ", stats.getValidRunAverageLength(), stats.getValidRunLengthStdDev(), gbc);
+        }
+
+        violatingRunsPanel.setBorder(BorderFactory.createTitledBorder("Violating runs not satisfying the property"));
+        gbc = GridBagHelper.as(0,0, GridBagHelper.Anchor.WEST, new Insets(5, 5, 5, 5));
+        if(stats.getViolatingRuns() == 0) {
+            violatingRunsPanel.add(new JLabel("No violating run"), gbc);
+        } else {
+            addStatIfPositive(violatingRunsPanel, "Number: ", stats.getViolatingRuns(), gbc);
+            addAvgStdDev(violatingRunsPanel, "Average duration: ", stats.getViolatingRunAverageTime(), stats.getViolatingRunTimeStdDev(), gbc);
+            addAvgStdDev(violatingRunsPanel, "Average length: ", stats.getViolatingRunAverageLength(), stats.getViolatingRunLengthStdDev(), gbc);
+        }
+
+        if(printRunsStats) {
+            gbc = GridBagHelper.as(0, 1, GridBagHelper.Anchor.WEST, GridBagHelper.Fill.BOTH, new Insets(30,0,0,0));
+            JPanel specificStats = new JPanel(new GridLayout());
+            specificStats.add(validRunsPanel, gbc);
+            specificStats.add(violatingRunsPanel, gbc);
+            statsPanel.add(specificStats, gbc);
+        }
+
+        return statsPanel;
+    }
+
+    private void addStatIfPositive(JPanel panel, String label, double stat, GridBagConstraints gbc) {
+        if(stat < 0) return;
+        int x = gbc.gridx;
+        panel.add(new JLabel(label), gbc);
+        gbc.gridx++;
+        panel.add(new JLabel(String.valueOf(stat)), gbc);
+        gbc.gridx = x;
+        gbc.gridy++;
+    }
+
+    private void addAvgStdDev(JPanel panel, String label, double avg, double stdDev, GridBagConstraints gbc) {
+        DecimalFormatSymbols decimalFormatSymbols = DecimalFormatSymbols.getInstance();
+        decimalFormatSymbols.setDecimalSeparator('.');
+        DecimalFormat format = new DecimalFormat("#.######", decimalFormatSymbols);
+        if(avg < 0) return;
+        String toPrint = format.format(avg);
+        int x = gbc.gridx;
+        panel.add(new JLabel(label), gbc);
+        gbc.gridx++;
+        panel.add(new JLabel(toPrint), gbc);
+        gbc.gridx++;
+        if(stdDev >= 0) {
+            JLabel sdLabel = new JLabel(" (SD: " + format.format(stdDev) + ")");
+            sdLabel.setToolTipText("<html>Standard deviation. <br/>In normal distribution, 68% of all values are one standard deviation from the average, <br/>95% of values within two standard deviations <br/>and 99.99% within three standard deviations from the average.</html>");
+            panel.add(sdLabel, gbc);
+        }
+        gbc.gridx = x;
+        gbc.gridy++;
+    }
+
+    private void addStatIfPositive(JPanel panel, String label, double stat, GridBagConstraints gbc, DecimalFormat format) {
+        if(stat < 0) return;
+        int x = gbc.gridx;
+        panel.add(new JLabel(label), gbc);
+        gbc.gridx++;
+        panel.add(new JLabel(format.format(stat)), gbc);
+        gbc.gridx = x;
+        gbc.gridy++;
+    }
+
+    private void addStatIfPositive(JPanel panel, String label, int stat, GridBagConstraints gbc) {
+        if(stat < 0) return;
+        int x = gbc.gridx;
+        panel.add(new JLabel(label), gbc);
+        gbc.gridx++;
+        panel.add(new JLabel(String.valueOf(stat)), gbc);
+        gbc.gridx = x;
+        gbc.gridy++;
+    }
+
+    private JPanel createRawQueryPanel(final String rawOutput) {
+        final JPanel fullPanel = new JPanel(new GridBagLayout());
+
+        JTextArea rawQueryLabel = new JTextArea(rawOutput);
+        rawQueryLabel.setEditable(false); // set textArea non-editable
+        JScrollPane scroll = new JScrollPane(rawQueryLabel);
+        scroll.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);
+        scroll.setPreferredSize(new Dimension(640,400));
+
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.fill = GridBagConstraints.BOTH;
+        gbc.weightx = 1;
+        gbc.weighty = 1;
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.anchor = GridBagConstraints.WEST;
+        fullPanel.add(scroll, gbc);
+
+        // Make window resizeable
+        fullPanel.addHierarchyListener(new HierarchyListener() {
+            public void hierarchyChanged(HierarchyEvent e) {
+                //when the hierarchy changes get the ancestor for the message
+                Window window = SwingUtilities.getWindowAncestor(fullPanel);
+                //check to see if the ancestor is an instance of Dialog and isn't resizable
+                if (window instanceof Dialog) {
+                    Dialog dialog = (Dialog) window;
+                    dialog.setMinimumSize(dialog.getPreferredSize());
+                    if (!dialog.isResizable()) {
+                        //set resizable to true
+                        dialog.setResizable(true);
+                    }
+                }
+            }
+        });
+
+        return fullPanel;
+    }
+
+}
diff --git a/src/main/java/dk/aau/cs/verification/SMCSettings.java b/src/main/java/dk/aau/cs/verification/SMCSettings.java
new file mode 100644
index 000000000..6a68e14d1
--- /dev/null
+++ b/src/main/java/dk/aau/cs/verification/SMCSettings.java
@@ -0,0 +1,43 @@
+package dk.aau.cs.verification;
+
+public class SMCSettings {
+
+    public int timeBound;
+    public int stepBound;
+    public float falsePositives;
+    public float falseNegatives;
+    public float indifferenceWidth;
+    public float confidence;
+    public float estimationIntervalWidth;
+    public boolean compareToFloat;
+    public float geqThan;
+
+    public static SMCSettings Default() {
+        SMCSettings settings = new SMCSettings();
+        settings.timeBound = 1000;
+        settings.stepBound = Integer.MAX_VALUE;
+        settings.falsePositives = 0.01f;
+        settings.falseNegatives = 0.01f;
+        settings.indifferenceWidth = 0.05f;
+        settings.confidence = 0.95f;
+        settings.estimationIntervalWidth = 0.05f;
+        settings.compareToFloat = false;
+        settings.geqThan = 0.5f;
+        return settings;
+    }
+
+    // Computes the number of runs needed according to :
+    // https://link.springer.com/content/pdf/10.1007/b94790.pdf p.78-79
+    // ONLY RELEVANT FOR PROBABILITY ESTIMATION !
+    public int chernoffHoeffdingBound() {
+        double bound = Math.log(2.0 / (1 - confidence)) / (2.0 * Math.pow(estimationIntervalWidth, 2));
+        return (int) Math.ceil(bound);
+    }
+
+    // ONLY RELEVANT FOR PROBABILITY ESTIMATION !
+    public float precisionFromRuns(int runsNeeded) {
+        return (float) Math.sqrt(
+            Math.log(2.0 / (1 - confidence)) / (2.0 * runsNeeded)
+        );
+    }
+}
diff --git a/src/main/java/dk/aau/cs/verification/SMCStats.java b/src/main/java/dk/aau/cs/verification/SMCStats.java
new file mode 100644
index 000000000..627dfc662
--- /dev/null
+++ b/src/main/java/dk/aau/cs/verification/SMCStats.java
@@ -0,0 +1,195 @@
+package dk.aau.cs.verification;
+
+import java.util.List;
+
+import pipe.gui.graph.GraphPoint;
+
+public class SMCStats extends Stats {
+
+    private int executedRuns;
+    private int validRuns;
+    private float averageRunTime;
+    private float averageRunLength;
+    private float runTimeStdDev = -1.0f;
+    private float runLengthStdDev = -1.0f;
+    private float verificationTime;
+    private float validRunAverageTime = -1.0f;
+    private float validRunAverageLength = -1.0f;
+    private float validRunTimeStdDev = -1.0f;
+    private float validRunLengthStdDev = -1.0f;
+    private float violatingRunAverageTime = -1.0f;
+    private float violatingRunAverageLength = -1.0f;
+    private float violatingRunTimeStdDev = -1.0f;
+    private float violatingRunLengthStdDev = -1.0f;
+
+    private List<GraphPoint> cumulativeStepPoints;
+    private List<GraphPoint> cumulativeDelayPoints;
+
+    public SMCStats(int executedRuns, int validRuns, float averageTime, float averageLength) {
+        super(-1,-1,-1);
+        this.executedRuns = executedRuns;
+        this.validRuns = validRuns;
+        this.averageRunTime = averageTime;
+        this.averageRunLength = averageLength;
+        this.verificationTime = -1.0f;
+    }
+
+    public SMCStats(int executedRuns, int validRuns, float averageTime, float averageLength, float verificationTime, List<GraphPoint> cumulativeStepPoints, List<GraphPoint> cumulativeDelayPoints) {
+        super(-1,-1,-1);
+        this.executedRuns = executedRuns;
+        this.validRuns = validRuns;
+        this.averageRunTime = averageTime;
+        this.averageRunLength = averageLength;
+        this.verificationTime = verificationTime;
+        this.cumulativeStepPoints = cumulativeStepPoints;
+        this.cumulativeDelayPoints = cumulativeDelayPoints; 
+    }
+
+    public float getVerificationTime() {
+        return this.verificationTime;
+    }
+
+    public int getExecutedRuns() {
+        return executedRuns;
+    }
+
+    public void setExecutedRuns(int executedRuns) {
+        this.executedRuns = executedRuns;
+    }
+
+    public int getValidRuns() {
+        return this.validRuns;
+    }
+
+    public int getViolatingRuns() {
+        return this.executedRuns - this.validRuns;
+    }
+
+    public float getAverageRunTime() {
+        return averageRunTime;
+    }
+
+    public float getAverageRunLength() {
+        return averageRunLength;
+    }
+
+    @Override
+    public String toString() {
+        return "Number of runs executed: " +
+            executedRuns +
+            (validRuns >= 0 ? 
+                System.getProperty("line.separator") +
+                "Number of valid runs: " +
+                validRuns : "") +
+            System.getProperty("line.separator") +
+            "Average run duration: " +
+            averageRunTime +
+            System.getProperty("line.separator") +
+            "Average transitions fired per run: " +
+            averageRunLength +
+            (validRunAverageTime >= 0 ?
+                System.getProperty("line.separator") +
+                "Valid run duration (average): " +
+                    validRunAverageTime : "") +
+            (validRunTimeStdDev >= 0 ?
+                System.getProperty("line.separator") +
+                    "Valid run duration (standard deviation): " +
+                    validRunTimeStdDev : "") +
+            (validRunAverageLength >= 0 ?
+                System.getProperty("line.separator") +
+                "Transitions fired per valid run (average): " +
+                    validRunAverageLength : "") +
+            (validRunLengthStdDev >= 0 ?
+                System.getProperty("line.separator") +
+                    "Transitions fired per valid run (standard deviation): " +
+                    validRunLengthStdDev : "");
+    }
+
+    public float getValidRunAverageTime() {
+        return validRunAverageTime;
+    }
+
+    public void setValidRunAverageTime(float validRunAverageTime) {
+        this.validRunAverageTime = validRunAverageTime;
+    }
+
+    public float getValidRunAverageLength() {
+        return validRunAverageLength;
+    }
+
+    public void setValidRunAverageLength(float validRunAverageLength) {
+        this.validRunAverageLength = validRunAverageLength;
+    }
+
+    public float getViolatingRunAverageTime() {
+        return violatingRunAverageTime;
+    }
+
+    public void setViolatingRunAverageTime(float violatingRunAverageTime) {
+        this.violatingRunAverageTime = violatingRunAverageTime;
+    }
+
+    public float getViolatingRunAverageLength() {
+        return violatingRunAverageLength;
+    }
+
+    public void setViolatingRunAverageLength(float violatingRunAverageLength) {
+        this.violatingRunAverageLength = violatingRunAverageLength;
+    }
+
+    public List<GraphPoint> getCumulativeStepPoints() {
+        return cumulativeStepPoints;
+    }
+
+    public List<GraphPoint> getCumulativeDelayPoints() {
+        return cumulativeDelayPoints;
+    }
+
+    public float getValidRunTimeStdDev() {
+        return validRunTimeStdDev;
+    }
+
+    public void setValidRunTimeStdDev(float validRunTimeStdDev) {
+        this.validRunTimeStdDev = validRunTimeStdDev;
+    }
+
+    public float getValidRunLengthStdDev() {
+        return validRunLengthStdDev;
+    }
+
+    public void setValidRunLengthStdDev(float validRunLengthStdDev) {
+        this.validRunLengthStdDev = validRunLengthStdDev;
+    }
+
+    public float getViolatingRunTimeStdDev() {
+        return violatingRunTimeStdDev;
+    }
+
+    public void setViolatingRunTimeStdDev(float violatingRunTimeStdDev) {
+        this.violatingRunTimeStdDev = violatingRunTimeStdDev;
+    }
+
+    public float getViolatingRunLengthStdDev() {
+        return violatingRunLengthStdDev;
+    }
+
+    public void setViolatingRunLengthStdDev(float violatingRunLengthStdDev) {
+        this.violatingRunLengthStdDev = violatingRunLengthStdDev;
+    }
+
+    public float getRunTimeStdDev() {
+        return runTimeStdDev;
+    }
+
+    public void setRunTimeStdDev(float runTimeStdDev) {
+        this.runTimeStdDev = runTimeStdDev;
+    }
+
+    public float getRunLengthStdDev() {
+        return runLengthStdDev;
+    }
+
+    public void setRunLengthStdDev(float runLengthStdDev) {
+        this.runLengthStdDev = runLengthStdDev;
+    }
+}
diff --git a/src/main/java/dk/aau/cs/verification/SMCTraceType.java b/src/main/java/dk/aau/cs/verification/SMCTraceType.java
new file mode 100644
index 000000000..68f7407f5
--- /dev/null
+++ b/src/main/java/dk/aau/cs/verification/SMCTraceType.java
@@ -0,0 +1,57 @@
+package dk.aau.cs.verification;
+
+public class SMCTraceType {
+    public static final String ANY = "Any";
+    public static final String SATISFIED = "Satisfied";
+    public static final String NOT_SATISFIED = "Not satisfied";
+
+    private static final int ANY_INT = 0;
+    private static final int SATISFIED_INT = 1;
+    private static final int NOT_SATISFIED_INT = 2;
+
+    private final String type;
+
+    public SMCTraceType() {
+        this.type = ANY;
+    }
+
+    public SMCTraceType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String toString() {
+        return type;
+    }
+
+    public String getArg() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("--smc-traces-type ");
+
+        if (type.equals(SATISFIED)) {
+            sb.append(SATISFIED_INT);
+        } else if (type.equals(NOT_SATISFIED)) {
+            sb.append(NOT_SATISFIED_INT);
+        } else {
+            sb.append(ANY_INT);
+        }
+
+        sb.append(" ");
+
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof SMCTraceType) {
+            return type.equals(((SMCTraceType) obj).type);
+        }
+
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return type.hashCode();
+    }
+}
diff --git a/src/main/java/dk/aau/cs/verification/TAPNComposer.java b/src/main/java/dk/aau/cs/verification/TAPNComposer.java
index 1dd3437c9..144543e37 100644
--- a/src/main/java/dk/aau/cs/verification/TAPNComposer.java
+++ b/src/main/java/dk/aau/cs/verification/TAPNComposer.java
@@ -292,7 +292,7 @@ private void createTransitions(TimedArcPetriNetNetwork model, TimedArcPetriNet c
                                 : timedTransition.name();
                         }
 
-						TimedTransition transition = new TimedTransition(uniqueTransitionName, timedTransition.isUrgent(), timedTransition.getGuard());
+						TimedTransition transition = new TimedTransition(uniqueTransitionName, timedTransition.isUrgent(), timedTransition.getGuard(), timedTransition.getDistribution(), timedTransition.getWeight(), timedTransition.getFiringMode());
 						if (timedTransition.isUncontrollable()) {
 						    transition.setUncontrollable(true);
                         }
diff --git a/src/main/java/dk/aau/cs/verification/VerificationOptions.java b/src/main/java/dk/aau/cs/verification/VerificationOptions.java
index ecc7193b9..6a2b0aa24 100644
--- a/src/main/java/dk/aau/cs/verification/VerificationOptions.java
+++ b/src/main/java/dk/aau/cs/verification/VerificationOptions.java
@@ -16,6 +16,7 @@ public abstract class VerificationOptions {
 	protected String reducedModelPath;
     protected static String unfoldedModelPath;
     protected static String unfoldedQueriesPath;
+    protected boolean isSimulate;
 
 	public abstract String toString();
 
@@ -53,4 +54,8 @@ public String unfoldedModelPath(){
     public String unfoldedQueriesPath(){
         return unfoldedQueriesPath;
     }
+
+    public boolean isSimulate(){
+        return isSimulate;
+    }
 }
diff --git a/src/main/java/dk/aau/cs/verification/VerificationResult.java b/src/main/java/dk/aau/cs/verification/VerificationResult.java
index dbfa3e7ea..5b95a41bb 100644
--- a/src/main/java/dk/aau/cs/verification/VerificationResult.java
+++ b/src/main/java/dk/aau/cs/verification/VerificationResult.java
@@ -55,7 +55,7 @@ public VerificationResult(QueryResult queryResult, TTrace trace, long verificati
 		this.stats = stats;
 		this.rawOutput = rawOutput;
 
-		if (rawOutput != null) {
+        if (rawOutput != null) {
             String[] lines = rawOutput.split(System.getProperty("line.separator"));
             for (String line : lines) {
                 Matcher matcher = Pattern.compile("\\s*--k-bound\\s*(\\d+)\\s*").matcher(line);
@@ -236,8 +236,12 @@ public long verificationTime() {
 	public String getVerificationTimeString() {
 		return String.format("Estimated verification time: %1$.2fs", verificationTime() / 1000.0);
 	}
-	
-	public String getStatsAsString(){
+
+    public Stats getStats(){
+        return stats;
+    }
+
+    public String getStatsAsString(){
 		return stats.toString();
 	}
 
diff --git a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPN.java b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPN.java
index 75d4eca39..cdd553b63 100644
--- a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPN.java
+++ b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPN.java
@@ -13,7 +13,6 @@
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
 import dk.aau.cs.model.tapn.TimedPlace;
 import dk.aau.cs.model.tapn.simulation.TimedArcPetriNetTrace;
-import dk.aau.cs.util.FormatException;
 import dk.aau.cs.util.Tuple;
 import dk.aau.cs.util.UnsupportedModelException;
 import dk.aau.cs.util.UnsupportedQueryException;
@@ -29,17 +28,16 @@
 import pipe.gui.Constants;
 import pipe.gui.FileFinder;
 import pipe.gui.MessengerImpl;
-import pipe.gui.TAPAALGUI;
 import pipe.gui.petrinet.PetriNetTab;
 import pipe.gui.petrinet.dataLayer.DataLayer;
 
-import javax.swing.*;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class VerifyDTAPN implements ModelChecker{
 
@@ -56,6 +54,8 @@ public class VerifyDTAPN implements ModelChecker{
 
 	protected ProcessRunner runner;
 
+    private boolean isSMC = false;
+
 	public VerifyDTAPN(FileFinder fileFinder, Messenger messenger) {
 		this.fileFinder = fileFinder;
 		this.messenger = messenger;
@@ -66,10 +66,19 @@ public boolean supportsStats() {
 	}
 
     public String[] getStatsExplanations(){
-        String[] explanations = new String[3];
-        explanations[0] = "The number of found markings (each time a successor is calculated, this number is incremented)";
-        explanations[1] = "The number of markings taken out of the waiting list during the search.";
-        explanations[2] = "The number of markings found in the passed/waiting list at the end of verification.";
+        String[] explanations;
+        if(!isSMC) {
+            explanations = new String[3];
+            explanations[0] = "The number of found markings (each time a successor is calculated, this number is incremented)";
+            explanations[1] = "The number of markings taken out of the waiting list during the search.";
+            explanations[2] = "The number of markings found in the passed/waiting list at the end of verification.";
+        } else {
+            explanations = new String[4];
+            explanations[0] = "The number of random runs executed during statistical verification";
+            explanations[1] = "The number of random runs satisfying the tested propriety";
+            explanations[2] = "The average total time delayed for executed random runs";
+            explanations[3] = "The average number of transitions firing for executed random runs";
+        }
         return explanations;
     }
 
@@ -278,6 +287,7 @@ private VerificationResult<TimedArcPetriNetTrace> verifyManually(String options,
             if (queryResult == null || queryResult.value1() == null) {
                 return new VerificationResult<>(errorOutput + System.getProperty("line.separator") + standardOutput, runner.getRunningTime());
             }
+            isSMC = queryResult.value1().isSMC();
             return new VerificationResult<>(queryResult.value1(), null, null, runner.getRunningTime(), queryResult.value2(), false, standardOutput + "\n\n" + errorOutput, model, null);
         }
     }
@@ -322,6 +332,7 @@ protected VerificationResult<TimedArcPetriNetTrace> verify(VerificationOptions o
 			if (queryResult == null || queryResult.value1() == null) {
 				return new VerificationResult<>(errorOutput + System.getProperty("line.separator") + standardOutput, runner.getRunningTime());
 			} else {
+                isSMC = queryResult.value1().isSMC();
                 TimedArcPetriNetTrace tapnTrace = null;
 
                 boolean isColored = (lens != null && lens.isColored() || (model.value1().parentNetwork() != null && model.value1().parentNetwork().isColored()));
@@ -329,8 +340,8 @@ protected VerificationResult<TimedArcPetriNetTrace> verify(VerificationOptions o
                     (query.getProperty() instanceof TCTLAGNode && !queryResult.value1().isQuerySatisfied()) ||
                     (query.getProperty() instanceof TCTLEGNode && queryResult.value1().isQuerySatisfied()) ||
                     (query.getProperty() instanceof TCTLAFNode && !queryResult.value1().isQuerySatisfied()));
-
-                if (options.traceOption() != TraceOption.NONE && isColored && showTrace) {
+            
+                if (options.traceOption() != TraceOption.NONE && isColored && showTrace || isSMC && options.isSimulate() && isColored) {
                     TapnEngineXmlLoader tapnLoader = new TapnEngineXmlLoader();
                     File fileOut = new File(options.unfoldedModelPath());
                     File queriesOut = new File(options.unfoldedQueriesPath());
@@ -338,13 +349,13 @@ protected VerificationResult<TimedArcPetriNetTrace> verify(VerificationOptions o
                         LoadedModel loadedModel = tapnLoader.load(fileOut);
                         TAPNComposer newComposer = new TAPNComposer(new MessengerImpl(), true);
                         model = newComposer.transformModel(loadedModel.network());
-
+                        
                         if (queryResult.value1() != null) {
                             tapnTrace = parseTrace(!errorOutput.contains("Trace:") ? errorOutput : (errorOutput.split("Trace:")[1]), options, model, exportedModel, query, queryResult.value1());
                         }
 
-                        if (tapnTrace != null) {
-                            newTab = new PetriNetTab(loadedModel.network(), loadedModel.templates(), loadedModel.queries(), new TAPNLens(lens.isTimed(), lens.isGame(), false));
+                        if (tapnTrace != null || options.isSimulate()) {
+                            newTab = new PetriNetTab(loadedModel.network(), loadedModel.templates(), loadedModel.queries(), new TAPNLens(lens.isTimed(), lens.isGame(), false, lens.isStochastic()));
 
                             //The query being verified should be the only query
                             for (net.tapaal.gui.petrinet.verification.TAPNQuery loadedQuery : UnfoldNet.getQueries(queriesOut, loadedModel.network(), query.getCategory())) {
@@ -360,6 +371,21 @@ protected VerificationResult<TimedArcPetriNetTrace> verify(VerificationOptions o
                     }
                 }
 
+                if (isSMC && options.isSimulate()) {
+                    VerifyTAPNTraceParser traceParser = new VerifyTAPNTraceParser(model.value1());
+                    BufferedReader reader = new BufferedReader(new StringReader(errorOutput));
+                    Map<String, TimedArcPetriNetTrace> parsedTraceMap = traceParser.parseTraces(reader);
+                    
+                    if (parsedTraceMap != null && !parsedTraceMap.isEmpty()) {
+                        if (parsedTraceMap.size() > 1) {
+                            var result = new VerificationResult<TimedArcPetriNetTrace>(queryResult.value1(), parsedTraceMap, runner.getRunningTime(), queryResult.value2(), false, standardOutput + "\n\n" + errorOutput, model, newTab); 
+                            return result;
+                        }
+                        
+                        tapnTrace = parsedTraceMap.values().iterator().next();
+                    }
+                }
+
                 if (tapnTrace == null) {
                     tapnTrace = parseTrace(!errorOutput.contains("Trace:") ? errorOutput : (errorOutput.split("Trace:")[1]), options, model, exportedModel, query, queryResult.value1());
                 }
@@ -375,6 +401,32 @@ protected VerificationResult<TimedArcPetriNetTrace> verify(VerificationOptions o
 		}
 	}
 
+    public Stats getStats(VerificationOptions options, Tuple<TimedArcPetriNet, NameMapping> model, TAPNQuery query, net.tapaal.gui.petrinet.verification.TAPNQuery dataLayerQuery, TAPNLens lens) {
+        VerifyTAPNExporter exporter;
+        if ((lens != null && lens.isColored() || model.value1().parentNetwork().isColored())) {
+            exporter = new VerifyTACPNExporter();
+        } else {
+            exporter = new VerifyTAPNExporter();
+        }
+        ExportedVerifyTAPNModel exportedModel = exporter.export(model.value1(), query, lens, model.value2(), null, dataLayerQuery);
+
+        if (exportedModel == null) {
+            messenger.displayErrorMessage("There was an error exporting the model");
+            return null;
+        }
+
+        runner = new ProcessRunner(verifydtapnpath, createArgumentString(exportedModel.modelFile(), exportedModel.queryFile(), options));
+        runner.run();
+
+        if (runner.error()) {
+            return null;
+        } else {
+            String standardOutput = readOutput(runner.standardOutput());
+            Tuple<QueryResult, Stats> queryResult = parseQueryResult(standardOutput, model.value1().marking().size() + query.getExtraTokens(), query.getExtraTokens(), query, model.value1());
+            return queryResult.value2();
+        }
+    }
+
 	private TimedArcPetriNetTrace parseTrace(String output, VerificationOptions options, Tuple<TimedArcPetriNet, NameMapping> model, ExportedVerifyTAPNModel exportedModel, TAPNQuery query, QueryResult queryResult) {
 		if (((VerifyTAPNOptions) options).trace() == TraceOption.NONE) return null;
 
diff --git a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOptions.java b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOptions.java
index cafe95812..774921102 100644
--- a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOptions.java
+++ b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOptions.java
@@ -1,6 +1,9 @@
 package dk.aau.cs.verification.VerifyTAPN;
 
 import com.sun.jna.Platform;
+
+import dk.aau.cs.verification.SMCTraceType;
+import net.tapaal.gui.petrinet.verification.TAPNQuery.QueryCategory;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.SearchOption;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.TraceOption;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.WorkflowMode;
@@ -24,6 +27,12 @@ public class VerifyDTAPNOptions extends VerifyTAPNOptions {
 	private final boolean colorFixpoint;
 	private boolean useRawVerification;
 	private String rawVerificationOptions;
+    private boolean parallel = false;
+    private boolean benchmark = false;
+    private int benchmarkRuns = 100;
+	private boolean isSmc;
+    private int numberOfTraces;
+    private SMCTraceType smcTraceType;
 
 	//Only used for boundedness analysis
 	public VerifyDTAPNOptions(
@@ -45,7 +54,7 @@ public VerifyDTAPNOptions(
 			boolean useRawVerification,
 			String rawVerificationOptions
 	) {
-		this(extraTokens, traceOption, search, symmetry, gcd, timeDarts, pTrie, false, false, new InclusionPlaces(), WorkflowMode.NOT_WORKFLOW, 0, enableOverApproximation, enableUnderApproximation, approximationDenominator, stubbornReduction, null, partition, colorFixpoint, unfoldNet, useRawVerification, rawVerificationOptions);
+		this(extraTokens, traceOption, search, symmetry, gcd, timeDarts, pTrie, false, false, new InclusionPlaces(), WorkflowMode.NOT_WORKFLOW, 0, enableOverApproximation, enableUnderApproximation, approximationDenominator, stubbornReduction, null, partition, colorFixpoint, unfoldNet, useRawVerification, rawVerificationOptions, false, 0, false, QueryCategory.Default, 1, new SMCTraceType(), false);
 		this.dontUseDeadPlaces = dontUseDeadPlaces;
 	}
 
@@ -71,7 +80,14 @@ public VerifyDTAPNOptions(
             boolean colorFixpoint,
             boolean unfoldNet,
 			boolean useRawVerification,
-			String rawVerificationOptions
+			String rawVerificationOptions,
+            boolean benchmark,
+            int benchmarkRuns,
+            boolean parallel,
+			QueryCategory queryCategory,
+            int numberOfTraces,
+            SMCTraceType smcTraceType,
+            boolean isSimulate
 	) {
 		super(extraTokens, traceOption, search, symmetry, useStateequationCheck, discreteInclusion, inclusionPlaces, enableOverApproximation, enableUnderApproximation, approximationDenominator);
 		this.timeDarts = timeDarts;
@@ -86,9 +102,16 @@ public VerifyDTAPNOptions(
         this.unfold = unfoldNet;
 		this.useRawVerification = useRawVerification;
 		this.rawVerificationOptions = rawVerificationOptions;
+        this.benchmark = benchmark;
+        this.benchmarkRuns = benchmarkRuns;
+        this.parallel = parallel;
+		this.isSmc = queryCategory == QueryCategory.SMC;
+        this.numberOfTraces = numberOfTraces;
+        this.smcTraceType = smcTraceType;
+        this.isSimulate = isSimulate;
 
 		// we only force unfolding when traces are involved
-        if((unfold && trace() != TraceOption.NONE || enableOverApproximation || enableUnderApproximation) && !useRawVerification)
+        if((unfold && trace() != TraceOption.NONE || enableOverApproximation || enableUnderApproximation || isSmc && isSimulate && unfold) && !useRawVerification)
         {
             try {
 				unfoldedModelPath = File.createTempFile("unfolded-", ".pnml").getAbsolutePath();
@@ -104,26 +127,31 @@ public String toString() {
 		StringBuilder result = new StringBuilder();
 	
 		if (useRawVerification && rawVerificationOptions != null) {
-			return rawVerificationString(rawVerificationOptions, traceArg(traceOption));
+            String rawOptions = benchmark ?
+                ("--smc-benchmark " + benchmarkRuns + " ") + rawVerificationOptions :
+                rawVerificationOptions;
+			return rawVerificationString(rawOptions, traceArg(traceOption));
 		}
 
         result.append(kBoundArg());
         result.append(deadTokenArg());
         result.append(traceArg(traceOption));
-        if(unfold && trace() != TraceOption.NONE || enabledOverApproximation || enabledUnderApproximation)
+        if(unfold && trace() != TraceOption.NONE || enabledOverApproximation || enabledUnderApproximation || isSmc && isSimulate && unfold)
         {
             result.append(writeUnfolded());
-			result.append(" --bindings ");
+            result.append(" --bindings ");
+        }
+        if(!isSmc) {
+            result.append(searchArg(searchOption));
+            result.append("--verification-method ");
+            result.append(timeDarts ? "1" : "0");
+            result.append(' ');
+            result.append("--memory-optimization ");
+            result.append(pTrie ? "1" : "0");
+            if (!useStubbornReduction) {
+                result.append(" --disable-partial-order ");
+            }
         }
-        result.append(searchArg(searchOption));
-		result.append("--verification-method ");
-		result.append(timeDarts ? "1" : "0");
-		result.append(' ');
-		result.append("--memory-optimization ");
-		result.append(pTrie ? "1" : "0");
-		if (! useStubbornReduction) {
-			result.append(" --disable-partial-order ");
-		}
 		if(workflow == WorkflowMode.WORKFLOW_SOUNDNESS){
 			result.append(" --workflow 1 ");
 		} else if(workflow == WorkflowMode.WORKFLOW_STRONG_SOUNDNESS){
@@ -137,6 +165,19 @@ public String toString() {
 			result.append(gcd ? " --gcd-lower " : ""); // GCD optimization is not sound for workflow analysis
 		}
 
+        result.append(parallel ? "--smc-parallel " : "");
+        result.append(benchmark ? "--smc-benchmark " + benchmarkRuns + " " : "");
+
+        if (isSmc) {
+            result.append("--smc-print-cumulative-stats 4 ");
+            if (isSimulate) {
+                result.append(" --smc-traces ");
+                result.append(numberOfTraces);
+                result.append(" ");
+                result.append(smcTraceType.getArg());
+            }
+        }
+
 		return result.toString();
 	}
 
diff --git a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOutputParser.java b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOutputParser.java
index 60f3a5fd6..a29eb6f60 100644
--- a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOutputParser.java
+++ b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOutputParser.java
@@ -8,14 +8,16 @@
 
 import dk.aau.cs.model.tapn.TAPNQuery;
 import dk.aau.cs.util.Tuple;
-import dk.aau.cs.verification.BoundednessAnalysisResult;
-import dk.aau.cs.verification.QueryResult;
-import dk.aau.cs.verification.Stats;
+import dk.aau.cs.verification.*;
+import pipe.gui.graph.GraphPoint;
 
 public class VerifyDTAPNOutputParser {
 	private static final String Query_IS_NOT_SATISFIED_STRING = "Query is NOT satisfied";
 	private static final String Query_IS_SATISFIED_STRING = "Query is satisfied";
 	private static final String DISCRETE_INCLUSION = "discrete inclusion";
+    private static final String SMC_Verification_INDICATOR_STRING = "SMC Verification";
+    private static final String SMC_Hypothesis_IS_SATISFIED_STRING = "Hypothesis is satisfied";
+    private static final String SMC_Hypothesis_IS_NOT_SATISFIED_STRING = "Hypothesis is NOT satisfied";
 
 	private static final Pattern discoveredPattern = Pattern.compile("\\s*discovered markings:\\s*(\\d+)\\s*");
 	private static final Pattern exploredPattern = Pattern.compile("\\s*explored markings:\\s*(\\d+)\\s*");
@@ -24,7 +26,30 @@ public class VerifyDTAPNOutputParser {
 	private static final Pattern transitionStatsPattern = Pattern.compile("<([^:\\s]+):(\\d+)>");
 	private static final Pattern placeBoundPattern = Pattern.compile("<([^;\\s]+);(\\d+)>");
     private static final Pattern placeBoundPatternUnknown = Pattern.compile("<([^;\\s]+);\\?>");
-        
+
+    private static final Pattern smcEstimationPattern = Pattern.compile("\\s*P = ([^±]+) ± (.+)\\s*");
+    private static final Pattern smcExecutedRunsPattern = Pattern.compile("\\s*runs executed:\\s*(\\d+)\\s*");
+    private static final Pattern smcValidRunsPattern = Pattern.compile("\\s*number of valid runs:\\s*(\\d+)\\s*");
+    private static final Pattern smcAverageTimePattern = Pattern.compile("\\s*average run duration:\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcAverageLengthPattern = Pattern.compile("\\s*average run length:\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcTimeStdDevPattern = Pattern.compile("\\s*run duration \\(std. dev.\\):\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcLengthStdDevPattern = Pattern.compile("\\s*run length \\(std. dev.\\):\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcVerificationTimePattern = Pattern.compile("\\s*verification time:\\s*([\\d\\.]+)\\s*");
+
+    private static final Pattern smcCumulativeProbabilityStepPattern = Pattern.compile("\\s*cumulative probability / step :");
+    private static final Pattern smcCumulativeProbabilityDelayPattern = Pattern.compile("\\s*cumulative probability / delay :");
+
+    private static final Pattern smcAverageValidTimePattern = Pattern.compile("\\s*duration of a valid run \\(average\\):\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcAverageValidLengthPattern = Pattern.compile("\\s*length of a valid run \\(average\\):\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcValidTimeStdDevPattern = Pattern.compile("\\s*duration of a valid run \\(std. dev.\\):\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcValidLengthStdDevPattern = Pattern.compile("\\s*length of a valid run \\(std. dev.\\):\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcAverageViolatingTimePattern = Pattern.compile("\\s*duration of a violating run \\(average\\):\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcAverageViolatingLengthPattern = Pattern.compile("\\s*length of a violating run \\(average\\):\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcViolatingTimeStdDevPattern = Pattern.compile("\\s*duration of a violating run \\(std. dev.\\):\\s*([\\d\\.]+)\\s*");
+    private static final Pattern smcViolatingLengthStdDevPattern = Pattern.compile("\\s*length of a violating run \\(std. dev.\\):\\s*([\\d\\.]+)\\s*");
+
+    private static final Pattern smcNumberOfTracesPattern = Pattern.compile("\\s*Generated \\d+ random traces");
+
 	private static final Pattern wfMinExecutionPattern = Pattern.compile("Minimum execution time: (-?\\d*)");
 	private static final Pattern wfMaxExecutionPattern = Pattern.compile("Maximum execution time: (-?\\d*)");
 	private static final Pattern wfCoveredMarkingPattern = Pattern.compile("Covered marking: (.*)");
@@ -46,12 +71,34 @@ public Tuple<QueryResult, Stats> parseOutput(String output) {
 		int stored = 0;
 		int WFminExecutionTime = -1;
 		int WFmaxExecutionTime = -1;
+        int smcExecutedRuns = -1;
+        int smcValidRuns = 0;
+        float smcAverageTime = -1.0f;
+        float smcAverageLength = -1.0f;
+        float smcTimeStdDev = -1.0f;
+        float smcLengthStdDev = -1.0f;
+        float smcVerificationTime = -1.0f;
+        float smcAverageValidTime = -1.0f;
+        float smcAverageValidLength = -1.0f;
+        float smcValidTimeStdDev = -1.0f;
+        float smcValidLengthStdDev = -1.0f;
+        float smcAverageViolatingTime = -1.0f;
+        float smcAverageViolatingLength = -1.0f;
+        float smcViolatingTimeStdDev = -1.0f;
+        float smcViolatingLengthStdDev = -1.0f;
 		ArrayList<Tuple<String, Tuple<BigDecimal, Integer>>> coveredMarking = null;
 		boolean result = false;
 		int maxUsedTokens = 0;
 		boolean foundResult = false;
 		boolean discreteInclusion = false;
+        boolean isSmc = false;
+        boolean isQuantitative = false;
+        QuantitativeResult quantitativeResult = null;
 		String[] lines = output.split(System.getProperty("line.separator"));
+
+		List<GraphPoint> cumulativeStepPoints = new ArrayList<>();
+		List<GraphPoint> cumulativeDelayPoints = new ArrayList<>();
+
 		try {			
 			Matcher matcher = transitionStatsPattern.matcher(output);
 			while (matcher.find()) {
@@ -67,13 +114,14 @@ public Tuple<QueryResult, Stats> parseOutput(String output) {
 			}
 			for (int i = 0; i < lines.length; i++) {
 				String line = lines[i];
+                if (line.contains(SMC_Verification_INDICATOR_STRING)) isSmc = true;
 				if (line.contains(DISCRETE_INCLUSION)) { discreteInclusion = true; }
-				if (line.contains(Query_IS_SATISFIED_STRING)) {
+				if (line.contains(Query_IS_SATISFIED_STRING) || line.contains(SMC_Hypothesis_IS_SATISFIED_STRING)) {
 					result = true;
 					foundResult = true;
-				} else if (line.contains(Query_IS_NOT_SATISFIED_STRING)) {
-					result = false;
-					foundResult = true;
+				} else if (line.contains(Query_IS_NOT_SATISFIED_STRING) || line.contains(SMC_Hypothesis_IS_NOT_SATISFIED_STRING)) {
+                    result = false;
+                    foundResult = true;
 				} else {
 					matcher = discoveredPattern.matcher(line);
 					if(matcher.find()){
@@ -120,13 +168,138 @@ public Tuple<QueryResult, Stats> parseOutput(String output) {
 							}
 						}
 					}
+
+                    matcher = smcEstimationPattern.matcher(line);
+                    if(matcher.find()) {
+                        foundResult = true;
+                        result = true;
+                        isQuantitative = true;
+                        float smcEstimation = Float.parseFloat(matcher.group(1));
+                        float smcEstimationWidth = Float.parseFloat(matcher.group(2));
+                        quantitativeResult = new QuantitativeResult(smcEstimation, smcEstimationWidth);
+                    }
+
+                    matcher = smcExecutedRunsPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcExecutedRuns = Integer.parseInt(matcher.group(1));
+                    }
+
+                    matcher = smcValidRunsPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcValidRuns = Integer.parseInt(matcher.group(1));
+                    }
+
+                    matcher = smcAverageTimePattern.matcher(line);
+                    if(matcher.find()) {
+                        smcAverageTime = Float.parseFloat(matcher.group(1));
+                    }
+                    matcher = smcAverageLengthPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcAverageLength = Float.parseFloat(matcher.group(1));
+                    }
+                    matcher = smcTimeStdDevPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcTimeStdDev = Float.parseFloat(matcher.group(1));
+                    }
+                    matcher = smcLengthStdDevPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcLengthStdDev = Float.parseFloat(matcher.group(1));
+                    }
+
+                    matcher = smcVerificationTimePattern.matcher(line);
+                    if(matcher.find()) {
+                        smcVerificationTime = Float.parseFloat(matcher.group(1));
+                    }
+
+                    matcher = smcAverageValidTimePattern.matcher(line);
+                    if(matcher.find()) {
+                        smcAverageValidTime = Float.parseFloat(matcher.group(1));
+                    }
+                    matcher = smcAverageValidLengthPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcAverageValidLength = Float.parseFloat(matcher.group(1));
+                    }
+                    matcher = smcValidTimeStdDevPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcValidTimeStdDev = Float.parseFloat(matcher.group(1));
+                    }
+                    matcher = smcValidLengthStdDevPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcValidLengthStdDev = Float.parseFloat(matcher.group(1));
+                    }
+                    matcher = smcAverageViolatingTimePattern.matcher(line);
+                    if(matcher.find()) {
+                        smcAverageViolatingTime = Float.parseFloat(matcher.group(1));
+                    }
+                    matcher = smcAverageViolatingLengthPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcAverageViolatingLength = Float.parseFloat(matcher.group(1));
+                    }
+                    matcher = smcViolatingTimeStdDevPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcViolatingTimeStdDev = Float.parseFloat(matcher.group(1));
+                    }
+                    matcher = smcViolatingLengthStdDevPattern.matcher(line);
+                    if(matcher.find()) {
+                        smcViolatingLengthStdDev = Float.parseFloat(matcher.group(1));
+                    }
+
+                    matcher = smcCumulativeProbabilityStepPattern.matcher(line);
+                    if (matcher.find() && i < lines.length - 1) {
+                        line = lines[i + 1];
+                        String[] pointStrs = line.split(";");
+                        for (String pointStr : pointStrs) {
+                            String[] coordinates = pointStr.split(":");
+                            GraphPoint point = new GraphPoint(Double.parseDouble(coordinates[0]), Double.parseDouble(coordinates[1]));
+                            cumulativeStepPoints.add(point);
+                        }
+                    }
+
+                    matcher = smcCumulativeProbabilityDelayPattern.matcher(line);
+                    if (matcher.find() && i < lines.length - 1) {
+                        line = lines[i + 1];
+                        String[] pointStrs = line.split(";");
+                        for (String pointStr : pointStrs) {
+                            String[] coordinates = pointStr.split(":");
+                            GraphPoint point = new GraphPoint(Double.parseDouble(coordinates[0]), Double.parseDouble(coordinates[1]));
+                            cumulativeDelayPoints.add(point);
+                        }
+                    }
+
+                    matcher = smcNumberOfTracesPattern.matcher(line);
+                    if (matcher.find()) {
+                        foundResult = true;
+                        result = true;
+                    }
 				}
 			}
-			
+            
 			if(!foundResult) return null;
 			
 			BoundednessAnalysisResult boundedAnalysis = new BoundednessAnalysisResult(totalTokens, maxUsedTokens, extraTokens);
-            return new Tuple<QueryResult, Stats>(new QueryResult(result, boundedAnalysis, query, discreteInclusion), new Stats(discovered, explored, stored, transitionStats, placeBoundStats, WFminExecutionTime, WFmaxExecutionTime, coveredMarking));
+            Stats verifStats;
+            QueryResult queryRes;
+
+            if(isSmc) {
+                verifStats = new SMCStats(smcExecutedRuns, smcValidRuns, smcAverageTime, smcAverageLength, smcVerificationTime, cumulativeStepPoints, cumulativeDelayPoints);
+                ((SMCStats) verifStats).setRunTimeStdDev(smcTimeStdDev);
+                ((SMCStats) verifStats).setRunLengthStdDev(smcLengthStdDev);
+                ((SMCStats) verifStats).setValidRunAverageTime(smcAverageValidTime);
+                ((SMCStats) verifStats).setValidRunAverageLength(smcAverageValidLength);
+                ((SMCStats) verifStats).setValidRunTimeStdDev(smcValidTimeStdDev);
+                ((SMCStats) verifStats).setValidRunLengthStdDev(smcValidLengthStdDev);
+                ((SMCStats) verifStats).setViolatingRunAverageTime(smcAverageViolatingTime);
+                ((SMCStats) verifStats).setViolatingRunAverageLength(smcAverageViolatingLength);
+                ((SMCStats) verifStats).setViolatingRunTimeStdDev(smcViolatingTimeStdDev);
+                ((SMCStats) verifStats).setViolatingRunLengthStdDev(smcViolatingLengthStdDev);
+            } else
+                verifStats = new Stats(discovered, explored, stored, transitionStats, placeBoundStats, WFminExecutionTime, WFmaxExecutionTime, coveredMarking);
+            if(isQuantitative) {
+                queryRes = new QueryResult(quantitativeResult, boundedAnalysis, query, discreteInclusion);
+            }
+            else
+                queryRes = new QueryResult(result, boundedAnalysis, query, discreteInclusion);
+            return new Tuple<QueryResult, Stats>(queryRes, verifStats);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
diff --git a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java
index a5ec1d9b0..2c86711bb 100644
--- a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java
+++ b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java
@@ -354,7 +354,7 @@ private VerificationResult<TimedArcPetriNetTrace> verify(VerificationOptions opt
                         }
 
                         if (tapnTrace != null) {
-                            newTab = new PetriNetTab(loadedModel.network(), loadedModel.templates(), loadedModel.queries(), new TAPNLens(lens.isTimed(), lens.isGame(), false));
+                            newTab = new PetriNetTab(loadedModel.network(), loadedModel.templates(), loadedModel.queries(), new TAPNLens(lens.isTimed(), lens.isGame(), false, lens.isStochastic()));
 
                             //The query being verified should be the only query
                             for (net.tapaal.gui.petrinet.verification.TAPNQuery loadedQuery : UnfoldNet.getQueries(queriesOut, loadedModel.network(), query.getCategory())) {
diff --git a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTACPNExporter.java b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTACPNExporter.java
index 3377303b2..f17d9de60 100644
--- a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTACPNExporter.java
+++ b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTACPNExporter.java
@@ -76,7 +76,10 @@ protected void outputTransition(TimedTransition t, PrintStream modelStream, Data
         modelStream.append("player=\"" + (t.isUncontrollable() ? "1" : "0") + "\" ");
         modelStream.append("id=\"" + t.name() + "\" ");
         modelStream.append("name=\"" + t.name() + "\" ");
-        modelStream.append("urgent=\"" + (t.isUrgent()? "true":"false") + "\"");
+        modelStream.append("urgent=\"" + (t.isUrgent()? "true":"false") + "\" ");
+        modelStream.append("weight=\""+ t.getWeight().nameForSaving(false) + "\" ");
+        modelStream.append("firingMode=\"" + t.getFiringMode().toString() + "\" ");
+        modelStream.append(t.getDistribution().toString());
         modelStream.append(">\n");
         modelStream.append(colorInformationToXMLString(t));
 
diff --git a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java
index ddb107555..3b36bf68f 100644
--- a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java
+++ b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java
@@ -346,7 +346,7 @@ protected VerificationResult<TimedArcPetriNetTrace> verify(VerificationOptions o
                         }
 
                         if (tapnTrace != null) {
-                            newTab = new PetriNetTab(loadedModel.network(), loadedModel.templates(), loadedModel.queries(), new TAPNLens(lens.isTimed(), lens.isGame(), false));
+                            newTab = new PetriNetTab(loadedModel.network(), loadedModel.templates(), loadedModel.queries(), new TAPNLens(lens.isTimed(), lens.isGame(), false, lens.isStochastic()));
 
                             //The query being verified should be the only query
                             for (net.tapaal.gui.petrinet.verification.TAPNQuery loadedQuery : UnfoldNet.getQueries(queriesOut, loadedModel.network(), query.getCategory())) {
diff --git a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java
index 306639135..d3a6fa1e9 100644
--- a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java
+++ b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java
@@ -7,9 +7,7 @@
 import java.util.Collection;
 
 import dk.aau.cs.TCTL.*;
-import dk.aau.cs.TCTL.visitors.HyperLTLQueryVisitor;
-import dk.aau.cs.TCTL.visitors.LTLQueryVisitor;
-import dk.aau.cs.TCTL.visitors.RenameAllPlacesVisitor;
+import dk.aau.cs.TCTL.visitors.*;
 import net.tapaal.gui.petrinet.TAPNLens;
 import dk.aau.cs.verification.NameMapping;
 import pipe.gui.petrinet.dataLayer.DataLayer;
@@ -24,7 +22,6 @@
 import dk.aau.cs.model.tapn.TimedTransition;
 import dk.aau.cs.model.tapn.TransportArc;
 
-import dk.aau.cs.TCTL.visitors.CTLQueryVisitor;
 import pipe.gui.TAPAALGUI;
 import pipe.gui.petrinet.graphicElements.Place;
 import pipe.gui.petrinet.graphicElements.Transition;
@@ -65,9 +62,12 @@ public ExportedVerifyTAPNModel export(TimedArcPetriNet model, TAPNQuery query, F
             } else if (query.getCategory() == QueryCategory.LTL) {
                 LTLQueryVisitor XMLVisitor = new LTLQueryVisitor();
                 queryStream.append(XMLVisitor.getXMLQueryFor(query.getProperty(), null));
-            } else if (query.getCategory() == QueryCategory.HyperLTL){
+            } else if (query.getCategory() == QueryCategory.HyperLTL) {
                 HyperLTLQueryVisitor XMLVisitor = new HyperLTLQueryVisitor();
                 queryStream.append(XMLVisitor.getXMLQueryFor(query.getProperty(), null));
+            } else if (query.getCategory() == QueryCategory.SMC) {
+                SMCQueryVisitor XMLVisitor = new SMCQueryVisitor();
+                queryStream.append(XMLVisitor.getXMLQueryFor(query.getProperty(), dataLayerQuery.getName(), dataLayerQuery.getSmcSettings()));
             } else if (lens != null && lens.isGame()) {
                 CTLQueryVisitor XMLVisitor = new CTLQueryVisitor();
                 queryStream.append(XMLVisitor.getXMLQueryFor(query.getProperty(), null, true));
@@ -161,6 +161,9 @@ protected void outputTransition(TimedTransition t, PrintStream modelStream, Data
         modelStream.append("player=\"" + (t.isUncontrollable() ? "1" : "0") + "\" ");
         modelStream.append("id=\"" + t.name() + "\" ");
 		modelStream.append("name=\"" + t.name() + "\" ");
+        modelStream.append("weight=\""+ t.getWeight().nameForSaving(false) + "\" ");
+        modelStream.append("firingMode=\"" + t.getFiringMode().toString() + "\" ");
+        modelStream.append(t.getDistribution().toString());
         modelStream.append("urgent=\"" + (t.isUrgent()? "true":"false") + "\"");
         modelStream.append(">\n");
 
diff --git a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNIconSelector.java b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNIconSelector.java
index 82cb16ab3..be15ca75b 100644
--- a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNIconSelector.java
+++ b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNIconSelector.java
@@ -56,6 +56,13 @@ public ImageIcon getIconFor(VerificationResult<?> result) {
                     return satisfiedIcon;
                 }
                 break;
+            case PF:
+            case PG:
+                if(result.getQueryResult().isQuantitative() || result.isQuerySatisfied()) {
+                    return satisfiedIcon;
+                } else {
+                    return notSatisfiedIcon;
+                }
             default:
                 return null;
         }
diff --git a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNTraceParser.java b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNTraceParser.java
index a1ce6ed33..e626d8f8a 100644
--- a/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNTraceParser.java
+++ b/src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNTraceParser.java
@@ -8,6 +8,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.LinkedHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -130,13 +132,15 @@ private void parseTraceNodes(TimedArcPetriNetTrace trace, NodeList childNodes) {
 
     private Document readerToDocument(BufferedReader reader) {
         Document document = null;
-
+        Pattern missingQueryIndexPattern = Pattern.compile("Missing query-indexes for query-file \\(which is identified as XML-format\\), assuming only first query is to be verified");
         try {
             StringBuilder sb = new StringBuilder();
             String line;
 
             while ((line = reader.readLine()) != null) {
                 if (line.contains("Trace")) continue;
+                Matcher matcher = missingQueryIndexPattern.matcher(line);
+                if (matcher.find()) continue;
                 sb.append(line);
                 sb.append(System.lineSeparator());
             }
@@ -165,7 +169,6 @@ public String getTraceNameToParse() {
 
 	private TimedTransitionStep parseTransitionStep(Element element) {
 		TimedTransition transition = tapn.getTransitionByName(element.getAttribute("id"));
-		
 		NodeList tokenNodes = element.getChildNodes();
 		List<TimedToken> consumedTokens = new ArrayList<TimedToken>(tokenNodes.getLength());
 		for(int i = 0; i < tokenNodes.getLength(); i++){
diff --git a/src/main/java/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java b/src/main/java/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java
index 95dc88cbf..5c2a9b1d4 100644
--- a/src/main/java/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java
+++ b/src/main/java/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java
@@ -185,6 +185,8 @@ private void processVerificationResult(File file, net.tapaal.gui.petrinet.verifi
 			String queryResult;
 			if (verificationResult.getQueryResult().isApproximationInconclusive()) {
 				queryResult = "Inconclusive";
+			} else if (verificationResult.getQueryResult().isQuantitative()) {
+				queryResult = verificationResult.getQueryResult().getProbabilityString();
 			} else {
 				queryResult = verificationResult.getQueryResult().isQuerySatisfied() ? "Satisfied" : "Not Satisfied";
 				if (isSoundnessCheck && !verificationResult.isQuerySatisfied())
@@ -239,7 +241,7 @@ private VerificationResult<TimedArcPetriNetTrace> verify(Tuple<TimedArcPetriNet,
         queryToVerify.setCategory(query.getCategory());
         MapQueryToNewNames(queryToVerify, composedModel.value2());
 
-        TAPNQuery clonedQuery = new TAPNQuery(query.getProperty().copy(), queryToVerify.getExtraTokens());
+        TAPNQuery clonedQuery = new TAPNQuery(query.getProperty().copy(), queryToVerify.getExtraTokens(), query.getSmcSettings());
         clonedQuery.setCategory(query.getCategory());
         MapQueryToNewNames(clonedQuery, composedModel.value2());
 
@@ -268,7 +270,7 @@ private VerificationResult<TimedArcPetriNetTrace> verify(Tuple<TimedArcPetriNet,
     }
 
 	private TAPNQuery getTAPNQuery(net.tapaal.gui.petrinet.verification.TAPNQuery query) throws Exception {
-		return new TAPNQuery(query.getProperty().copy(), query.getCapacity());
+		return new TAPNQuery(query.getProperty().copy(), query.getCapacity(), query.getSmcSettings());
 	}
 
 	private ModelChecker getModelChecker(net.tapaal.gui.petrinet.verification.TAPNQuery query) {
@@ -297,7 +299,7 @@ public VerificationOptions getVerificationOptionsFromQuery(net.tapaal.gui.petrin
         if (query.getReductionOption() == ReductionOption.VerifyTAPN) {
             return new VerifyTAPNOptions(query.getCapacity(), TraceOption.NONE, query.getSearchOption(), query.useSymmetry(), false, query.discreteInclusion(), query.inclusionPlaces(), query.isOverApproximationEnabled(), query.isUnderApproximationEnabled(), query.approximationDenominator(), query.isColored(), false, query.getRawVerification(), query.getRawVerificationPrompt());    // XXX DISABLES OverApprox
         } else if (query.getReductionOption() == ReductionOption.VerifyDTAPN) {
-            return new VerifyDTAPNOptions(query.getCapacity(), TraceOption.NONE, query.getSearchOption(), query.useSymmetry(), query.useGCD(), query.useTimeDarts(), query.usePTrie(), false, query.discreteInclusion(), query.inclusionPlaces(), query.getWorkflowMode(), 0, query.isOverApproximationEnabled(), query.isUnderApproximationEnabled(), query.approximationDenominator(), query.isStubbornReductionEnabled(), null, query.usePartitioning(), query.useColorFixpoint(), query.isColored(), query.getRawVerification(), query.getRawVerificationPrompt());
+            return new VerifyDTAPNOptions(query.getCapacity(), TraceOption.NONE, query.getSearchOption(), query.useSymmetry(), query.useGCD(), query.useTimeDarts(), query.usePTrie(), false, query.discreteInclusion(), query.inclusionPlaces(), query.getWorkflowMode(), 0, query.isOverApproximationEnabled(), query.isUnderApproximationEnabled(), query.approximationDenominator(), query.isStubbornReductionEnabled(), null, query.usePartitioning(), query.useColorFixpoint(), query.isColored(), query.getRawVerification(), query.getRawVerificationPrompt(), query.isBenchmarkMode(), query.getBenchmarkRuns(), query.isParallel(), query.getCategory(), query.getNumberOfTraces(), query.getSmcTraceType(), query.isSimulate());
         } else if (query.getReductionOption() == ReductionOption.VerifyPN || query.getReductionOption() == ReductionOption.VerifyPNApprox || query.getReductionOption() == ReductionOption.VerifyPNReduce) {
             return new VerifyPNOptions(query.getCapacity(), TraceOption.NONE, query.getSearchOption(), query.useOverApproximation(), query.useReduction() ? ModelReduction.AGGRESSIVE : ModelReduction.NO_REDUCTION, query.isOverApproximationEnabled(), query.isUnderApproximationEnabled(), query.approximationDenominator(), query.getCategory(), query.getAlgorithmOption(), query.isSiphontrapEnabled(), query.isQueryReductionEnabled() ? QueryReductionTime.UnlimitedTime : QueryReductionTime.NoTime, query.isStubbornReductionEnabled(), null, query.isTarOptionEnabled(), query.isTarjan(), query.isColored(), false, query.usePartitioning(), query.useColorFixpoint(), query.useSymmetricVars(), query.useColoredReduction(), query.getRawVerification(), query.getRawVerificationPrompt());
         } else {
diff --git a/src/main/java/net/tapaal/gui/TabActions.java b/src/main/java/net/tapaal/gui/TabActions.java
index 516bbf71d..1ddc64cd4 100644
--- a/src/main/java/net/tapaal/gui/TabActions.java
+++ b/src/main/java/net/tapaal/gui/TabActions.java
@@ -100,6 +100,8 @@ public interface TabActions {
 
     void changeColorFeature(boolean isColor);
 
+    void changeStochasticFeature(boolean isStochastic);
+
     void exportPNG();
 
     void exportPS();
diff --git a/src/main/java/net/tapaal/gui/petrinet/TAPNLens.java b/src/main/java/net/tapaal/gui/petrinet/TAPNLens.java
index c55d4f40c..5fb00647d 100644
--- a/src/main/java/net/tapaal/gui/petrinet/TAPNLens.java
+++ b/src/main/java/net/tapaal/gui/petrinet/TAPNLens.java
@@ -1,7 +1,7 @@
 package net.tapaal.gui.petrinet;
 
 public final class TAPNLens {
-    public static final TAPNLens Default = new TAPNLens(true, true, true);
+    public static final TAPNLens Default = new TAPNLens(true, true, true, false);
 
     public boolean isTimed() {
         return timed;
@@ -15,13 +15,21 @@ public boolean isColored() {
         return colored;
     }
 
+    public boolean isStochastic() { return stochastic; }
+
+    public boolean canBeStochastic() {
+        return timed && (!game); // && (!colored);
+    }
+
     private final boolean timed;
     private final boolean game;
     private final boolean colored;
+    private final boolean stochastic;
 
-    public TAPNLens(boolean timed, boolean game, boolean colored) {
+    public TAPNLens(boolean timed, boolean game, boolean colored, boolean stochastic) {
         this.timed = timed;
         this.game = game;
         this.colored = colored;
+        this.stochastic = stochastic && canBeStochastic();
     }
 }
diff --git a/src/main/java/net/tapaal/gui/petrinet/TabTransformer.java b/src/main/java/net/tapaal/gui/petrinet/TabTransformer.java
index 632338693..904e4332d 100644
--- a/src/main/java/net/tapaal/gui/petrinet/TabTransformer.java
+++ b/src/main/java/net/tapaal/gui/petrinet/TabTransformer.java
@@ -1,5 +1,19 @@
 package net.tapaal.gui.petrinet;
 
+import dk.aau.cs.TCTL.LTLANode;
+import dk.aau.cs.TCTL.LTLFNode;
+import dk.aau.cs.TCTL.LTLGNode;
+import dk.aau.cs.TCTL.StringPosition;
+import dk.aau.cs.TCTL.TCTLAFNode;
+import dk.aau.cs.TCTL.TCTLAGNode;
+import dk.aau.cs.TCTL.TCTLAbstractProperty;
+import dk.aau.cs.TCTL.TCTLAbstractStateProperty;
+import dk.aau.cs.TCTL.TCTLAndListNode;
+import dk.aau.cs.TCTL.TCTLEFNode;
+import dk.aau.cs.TCTL.TCTLEGNode;
+import dk.aau.cs.TCTL.TCTLNotNode;
+import dk.aau.cs.TCTL.TCTLOrListNode;
+import dk.aau.cs.TCTL.TCTLStatePlaceHolder;
 import dk.aau.cs.TCTL.visitors.RenameAllPlacesVisitor;
 import dk.aau.cs.TCTL.visitors.RenameAllTransitionsVisitor;
 import dk.aau.cs.verification.VerifyTAPN.VerifyDTAPN;
@@ -20,11 +34,11 @@
 import pipe.gui.petrinet.graphicElements.tapn.TimedOutputArcComponent;
 import pipe.gui.petrinet.graphicElements.tapn.TimedTransportArcComponent;
 import net.tapaal.gui.petrinet.verification.UnfoldNet;
+import net.tapaal.gui.petrinet.verification.TAPNQuery.QueryCategory;
 import net.tapaal.gui.petrinet.verification.RunningVerificationDialog;
 import pipe.gui.petrinet.PetriNetTab;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Vector;
 
@@ -185,6 +199,81 @@ static public void removeGameInformation(PetriNetTab tab) {
             }
         }
     }
+    static public void removeDistributionInformation(PetriNetTab tab) {
+        for (Template template : tab.allTemplates()) {
+            for (TimedTransition transition : template.model().transitions()) {
+                if (transition.hasCustomDistribution()) {
+                    transition.setDistribution(SMCDistribution.defaultDistribution());
+                }
+            }
+        }
+    }
+
+    /**
+     * Converts between SMC and reachability queries
+     */
+    public static void convertQueriesToOrFromSmc(Iterable<TAPNQuery> queries) {
+        for (TAPNQuery query : queries) {
+            boolean isSmc = query.getCategory().equals(QueryCategory.SMC);
+            TCTLAbstractProperty property = query.getProperty();
+            query.setProperty(smcConverter(property));
+            query.setCategory(isSmc ? QueryCategory.CTL : QueryCategory.SMC);
+            query.setSmcSettings(SMCSettings.Default());
+        }  
+    }
+
+    private static TCTLAbstractProperty smcConverter(TCTLAbstractProperty property) {
+        TCTLAbstractStateProperty child = getFirstChildOfProperty(property);
+        if (property instanceof LTLFNode) {
+            return new TCTLEFNode(child);
+        } else if (property instanceof LTLGNode) {
+            return new TCTLAGNode(child);
+        } else if (property instanceof TCTLEFNode) {
+            return new LTLFNode(child);
+        }  else if (property instanceof TCTLEGNode) {
+            return new LTLGNode(child);
+        } else if (property instanceof TCTLAFNode) {
+            return new LTLFNode(child);
+        } else if (property instanceof TCTLAGNode) {
+            return new LTLGNode(child);
+        } else if (property instanceof TCTLAndListNode) {
+            TCTLAndListNode andNode = (TCTLAndListNode) property;
+            List<TCTLAbstractStateProperty> properties = andNode.getProperties();
+            List<TCTLAbstractStateProperty> convertedProperties = new ArrayList<>();
+            for (TCTLAbstractStateProperty prop : properties) {
+                convertedProperties.add((TCTLAbstractStateProperty) smcConverter(prop));
+            }
+
+            return new TCTLAndListNode(convertedProperties);
+        } else if (property instanceof TCTLOrListNode) {
+            TCTLOrListNode orNode = (TCTLOrListNode) property;
+            List<TCTLAbstractStateProperty> properties = orNode.getProperties();
+            List<TCTLAbstractStateProperty> convertedProperties = new ArrayList<>();
+            for (TCTLAbstractStateProperty prop : properties) {
+                convertedProperties.add((TCTLAbstractStateProperty) smcConverter(prop));
+            }
+
+            return new TCTLOrListNode(convertedProperties);
+        } else if (property instanceof TCTLNotNode) {
+            TCTLNotNode notNode = (TCTLNotNode) property;
+            return new TCTLNotNode((TCTLAbstractStateProperty) smcConverter(notNode.getProperty()));
+        } else {
+            return property;
+        }
+    }
+
+    private static TCTLAbstractStateProperty getFirstChildOfProperty(TCTLAbstractProperty property) {
+        StringPosition[] children = property.getChildren();
+        for (int i = 0; i < children.length; ++i) {
+            TCTLAbstractProperty child = children[i].getObject();
+            if (child instanceof TCTLAbstractStateProperty) {
+                return (TCTLAbstractStateProperty) child;
+            }
+        }
+
+        return new TCTLStatePlaceHolder();
+    }
+
     static public void removeColorInformation(PetriNetTab tab) {
         tab.network().setColorTypes(List.of(ColorType.COLORTYPE_DOT));
         tab.network().setVariables(new ArrayList<Variable>());
diff --git a/src/main/java/net/tapaal/gui/petrinet/dialog/BatchProcessingDialog.java b/src/main/java/net/tapaal/gui/petrinet/dialog/BatchProcessingDialog.java
index fd465e26e..c769306e4 100644
--- a/src/main/java/net/tapaal/gui/petrinet/dialog/BatchProcessingDialog.java
+++ b/src/main/java/net/tapaal/gui/petrinet/dialog/BatchProcessingDialog.java
@@ -97,6 +97,7 @@ public class BatchProcessingDialog extends JDialog {
 	private final static String NOT_SATISFIED_STRING_SOUNDNESS = "Not Sound";
 	private final static String NOT_SATISFIED_STRING = "Not Satisfied";
     private final static String SATISFIED_STRING = "Satisfied";
+	private final static String PROBABILITY_STRING = "P = ";
     private final static String INCONCLUSIVE_STRING = "Inconclusive";
 	private final static String SATISFIED_SOUNDNESS_STRING = "Sound";
 	private final static String SATISFIED_STRONG_SOUNDNESS_STRING = "Strongly Sound";
@@ -1259,7 +1260,7 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
 					boolean isQueryColumn = table.getColumnName(column).equals("Query");
 					if (value != null) {
 						if ((isResultColumn && value.toString().equals(SATISFIED_STRING) || value.toString().equals(SATISFIED_SOUNDNESS_STRING) ||
-                            value.toString().equals(SATISFIED_STRONG_SOUNDNESS_STRING)) || (isQueryColumn && value.toString().equals("TRUE"))) {
+                            value.toString().equals(SATISFIED_STRONG_SOUNDNESS_STRING)) || (isQueryColumn && value.toString().equals("TRUE")) || (isResultColumn && value.toString().contains(PROBABILITY_STRING))) {
                             setBackground(new Color(91, 255, 91)); // light green
                         } else if ((isResultColumn && (value.toString().equals(NOT_SATISFIED_STRING) || value.toString().equals(NOT_SATISFIED_STRING_STRONG_SOUNDNESS) ||
                             value.toString().equals(NOT_SATISFIED_STRING_SOUNDNESS))) || (isQueryColumn && value.toString().equals("FALSE"))) {
diff --git a/src/main/java/net/tapaal/gui/petrinet/dialog/NewTAPNPanel.java b/src/main/java/net/tapaal/gui/petrinet/dialog/NewTAPNPanel.java
index cbe10ce29..7b9bc350e 100644
--- a/src/main/java/net/tapaal/gui/petrinet/dialog/NewTAPNPanel.java
+++ b/src/main/java/net/tapaal/gui/petrinet/dialog/NewTAPNPanel.java
@@ -17,8 +17,12 @@ public class NewTAPNPanel extends EscapableDialog {
 	private final GuiFrame frame;
 	private JTextField nameTextBox;
 	private JRadioButton timedNet;
+    private JRadioButton untimedNet;
 	private JRadioButton gameNet;
+    private JRadioButton nonGameNet;
 	private JRadioButton coloredNet;
+    private JRadioButton nonColorNet;
+    private JRadioButton stochasticNet;
 	private static int newNameCounter = 1;
     static NewTAPNPanel newTAPNPanel;
     private final static String COLORED_GAMES_NOT_SUPPORTED = "There exists no verification engine for colored games, we only allow modelling.\n\n Do you wish to continue?";
@@ -84,7 +88,7 @@ private void initButtonPanel() {
 		gbc.anchor = GridBagConstraints.EAST;
 		buttonPanel.add(cancelButton,gbc);		
 
-		okButton.addActionListener(e -> createNewTAPNBasedOnSelection(nameTextBox.getText(), timedNet.isSelected(), gameNet.isSelected(), coloredNet.isSelected()));
+		okButton.addActionListener(e -> createNewTAPNBasedOnSelection(nameTextBox.getText(), timedNet.isSelected(), gameNet.isSelected(), coloredNet.isSelected(), stochasticNet.isSelected()));
 
 		rootPane.setDefaultButton(okButton);
 		
@@ -102,7 +106,7 @@ protected void exit() {
 		rootPane.getParent().setVisible(false);
 	}
 
-	protected void createNewTAPNBasedOnSelection(String name, boolean isTimed, boolean isGame, boolean isColored) {
+	protected void createNewTAPNBasedOnSelection(String name, boolean isTimed, boolean isGame, boolean isColored, boolean isStochastic) {
 		if (!name.endsWith(".tapn")) {
 			name = name + ".tapn";
 		}
@@ -115,7 +119,7 @@ protected void createNewTAPNBasedOnSelection(String name, boolean isTimed, boole
 		}
 
 		try {
-			PetriNetTab tab = PetriNetTab.createNewEmptyTab(name, isTimed, isGame, isColored);
+			PetriNetTab tab = PetriNetTab.createNewEmptyTab(name, isTimed, isGame, isColored, isStochastic);
 			TAPAALGUI.openNewTabFromStream(tab);
 		} catch (Exception e) {
 			JOptionPane
@@ -169,6 +173,7 @@ private void initSelectionPanel() {
         initTimeOptions(selectionPanel);
         initGameOptions(selectionPanel);
         initColorOptions(selectionPanel);
+        initStochasticOptions(selectionPanel);
 
         GridBagConstraints gbc = new GridBagConstraints();
         gbc.gridx = 0;
@@ -192,7 +197,7 @@ private void initTimeOptions(JPanel selectionPanel) {
         gbc.insets = new Insets(3, 3, 3, 3);
         isTimedPanel.add(timedText, gbc);
 
-        JRadioButton untimedNet = new JRadioButton("No");
+        untimedNet = new JRadioButton("No");
         untimedNet.setSelected(true);
         gbc = new GridBagConstraints();
         gbc.gridx = 1;
@@ -235,7 +240,7 @@ private void initGameOptions(JPanel selectionPanel) {
         gbc.insets = new Insets(3, 3, 3, 3);
         isGamePanel.add(gameText, gbc);
 
-        JRadioButton nonGameNet = new JRadioButton("No");
+        nonGameNet = new JRadioButton("No");
         nonGameNet.setSelected(true);
         gbc = new GridBagConstraints();
         gbc.gridx = 1;
@@ -276,7 +281,7 @@ private void initColorOptions(JPanel selectionPanel) {
         gbc.insets = new Insets(3, 3, 3, 3);
         isColorPanel.add(colorText, gbc);
 
-        JRadioButton nonColorNet = new JRadioButton("No");
+        nonColorNet = new JRadioButton("No");
         nonColorNet.setSelected(true);
         gbc = new GridBagConstraints();
         gbc.gridx = 1;
@@ -305,6 +310,66 @@ private void initColorOptions(JPanel selectionPanel) {
         selectionPanel.add(isColorPanel, gbc);
     }
 
+    private void initStochasticOptions(JPanel selectionPanel) {
+        JPanel isStochasticPanel = new JPanel(new GridBagLayout());
+        ButtonGroup isStochasticRadioButtonGroup = new ButtonGroup();
+
+        JLabel colorText = new JLabel("Use stochastic semantics :");
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.weightx = 0;
+        gbc.anchor = GridBagConstraints.WEST;
+        gbc.insets = new Insets(3, 3, 3, 3);
+        isStochasticPanel.add(colorText, gbc);
+
+        JRadioButton nonStochasticNet = new JRadioButton("No");
+        nonStochasticNet.setSelected(true);
+        gbc = new GridBagConstraints();
+        gbc.gridx = 1;
+        gbc.gridy = 0;
+        gbc.weightx = 0;
+        gbc.anchor = GridBagConstraints.WEST;
+        gbc.insets = new Insets(3, 3, 3, 3);
+        isStochasticPanel.add(nonStochasticNet, gbc);
+        isStochasticRadioButtonGroup.add(nonStochasticNet);
+
+        stochasticNet = new JRadioButton("Yes");
+        gbc = new GridBagConstraints();
+        gbc.gridx = 2;
+        gbc.gridy = 0;
+        gbc.weightx = 0;
+        gbc.anchor = GridBagConstraints.WEST;
+        gbc.insets = new Insets(3, 3, 3, 3);
+        isStochasticPanel.add(stochasticNet, gbc);
+        isStochasticRadioButtonGroup.add(stochasticNet);
+
+        gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 4;
+        gbc.anchor = GridBagConstraints.WEST;
+        gbc.insets = new Insets(5, 5, 5, 5);
+        selectionPanel.add(isStochasticPanel, gbc);
+
+        var refreshOthers = new ActionListener() {
+            public void actionPerformed(ActionEvent actionEvent) {
+                if(stochasticNet.isSelected()) {
+                    nonGameNet.setSelected(true);
+                    timedNet.setSelected(true);
+                }
+            }
+        };
+        var refreshStochastic = new ActionListener() {
+            public void actionPerformed(ActionEvent actionEvent) {
+                if(gameNet.isSelected()) nonStochasticNet.setSelected(true);
+                if(untimedNet.isSelected()) nonStochasticNet.setSelected(true);
+            }
+        };
+        stochasticNet.addActionListener(refreshOthers);
+        untimedNet.addActionListener(refreshStochastic);
+        gameNet.addActionListener(refreshStochastic);
+    }
+
     public void setName(String name){
         nameTextBox.setText(name);
     }
diff --git a/src/main/java/net/tapaal/gui/petrinet/dialog/QueryDialog.java b/src/main/java/net/tapaal/gui/petrinet/dialog/QueryDialog.java
index cfabafb4d..7890f867d 100644
--- a/src/main/java/net/tapaal/gui/petrinet/dialog/QueryDialog.java
+++ b/src/main/java/net/tapaal/gui/petrinet/dialog/QueryDialog.java
@@ -2,19 +2,13 @@
 
 import java.awt.*;
 import java.awt.Dialog.ModalityType;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import java.awt.event.*;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -39,7 +33,10 @@
 import dk.aau.cs.TCTL.CTLParsing.TAPAALCTLQueryParser;
 import dk.aau.cs.TCTL.HyperLTLParsing.TAPAALHyperLTLQueryParser;
 import dk.aau.cs.TCTL.LTLParsing.TAPAALLTLQueryParser;
+import dk.aau.cs.TCTL.SMCParsing.TAPAALSMCQueryParser;
 import dk.aau.cs.TCTL.visitors.*;
+import dk.aau.cs.util.VerificationCallback;
+import dk.aau.cs.verification.*;
 import net.tapaal.gui.petrinet.TAPNLens;
 import pipe.gui.petrinet.PetriNetTab;
 import dk.aau.cs.model.CPN.ColorType;
@@ -54,6 +51,7 @@
 import net.tapaal.gui.petrinet.Template;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.SearchOption;
 import net.tapaal.gui.petrinet.verification.TAPNQuery.TraceOption;
+import net.tapaal.gui.petrinet.verification.TAPNQuery.VerificationType;
 import pipe.gui.*;
 import dk.aau.cs.TCTL.Parsing.TAPAALQueryParser;
 import dk.aau.cs.approximation.OverApproximation;
@@ -63,17 +61,13 @@
 import dk.aau.cs.util.Tuple;
 import dk.aau.cs.util.UnsupportedModelException;
 import dk.aau.cs.util.UnsupportedQueryException;
-import dk.aau.cs.verification.ITAPNComposer;
-import dk.aau.cs.verification.ModelChecker;
-import dk.aau.cs.verification.NameMapping;
-import dk.aau.cs.verification.TAPNComposer;
 import dk.aau.cs.verification.UPPAAL.UppaalExporter;
 import pipe.gui.canvas.Zoomer;
 import pipe.gui.swingcomponents.EscapableDialog;
 import pipe.gui.swingcomponents.filebrowser.FileBrowser;
 
 public class QueryDialog extends JPanel {
-	private static final String NO_UPPAAL_XML_FILE_SAVED = "No Uppaal XML file saved.";
+    private static final String NO_UPPAAL_XML_FILE_SAVED = "No Uppaal XML file saved.";
 	private static final String NO_VERIFYTAPN_XML_FILE_SAVED = "No verifytapn XML file saved.";
 	private static final String UNSUPPORTED_MODEL_TEXT = "The model is not supported by the chosen reduction.";
 	private static final String UNSUPPORTED_QUERY_TEXT = "The query is not supported by the chosen reduction.";
@@ -82,6 +76,8 @@ public class QueryDialog extends JPanel {
 	private static final String EXPORT_VERIFYPN_BTN_TEXT = "Export PN XML";
 	private static final String EXPORT_COMPOSED_BTN_TEXT = "Merge net components";
     private static final String OPEN_REDUCED_BTN_TEXT = "Open reduced net";
+    public static final String UPDATE_VERIFICATION_TIME_BTN_TEXT = "Compute estimated verification time";
+    public static final String UPDATE_PRECISION_BTN_TEXT = "Compute precision for the given verification time";
 
 	private static final String UPPAAL_SOME_TRACE_STRING = "Some trace       ";
 	private static final String SOME_TRACE_STRING = "Some trace       ";
@@ -226,6 +222,41 @@ public enum QueryDialogueOption {
     private JRadioButton underApproximationEnable;
     private CustomJSpinner overApproximationDenominator;
 
+    // SMC options panel
+    private JPanel smcSettingsPanel;
+    private JComboBox<String> smcVerificationType;
+    private JLabel smcVerificationTypeLabel;
+    private JTextField smcTimeBoundValue;
+    private JCheckBox smcTimeBoundInfinite;
+    private JTextField smcStepBoundValue;
+    private JCheckBox smcStepBoundInfinite;
+    private JPanel quantitativePanel;
+    private JLabel smcParallelLabel;
+    private JCheckBox smcParallel;
+    private JTextField smcConfidence;
+    private QuerySlider smcConfidenceSlider;
+    private QuerySlider smcPrecisionSlider;
+    private QuerySlider smcEstimatedTimeSlider;
+    private JTextField smcEstimationIntervalWidth;
+    private JTextField smcTimeExpected;
+    private JButton smcTimeEstimationButton;
+    private JPanel qualitativePanel;
+    private JTextField smcFalsePositives;
+    private JTextField smcFalseNegatives;
+    private JTextField smcIndifference;
+    private JTextField smcComparisonFloat;
+    private QuerySlider smcFalsePositivesSlider;
+    private QuerySlider smcFalseNegativesSlider;
+    private QuerySlider smcIndifferenceSlider;
+    private QuerySlider smcComparisonFloatSlider;
+    private JPanel smcTracePanel;
+    private CustomJSpinner smcNumberOfTraces;
+    private JComboBox<SMCTraceType> smcTraceType;
+    private SMCSettings smcSettings;
+    private boolean smcMustUpdateTime = true;
+    private boolean doingBenchmark = false;
+    private RunVerificationBase benchmarkThread = null;
+
     // Buttons in the bottom of the dialogue
     private JPanel buttonPanel;
     private JButton cancelButton;
@@ -410,6 +441,21 @@ public enum QueryDialogueOption {
     private final static String TOOL_TIP_APPROXIMATION_METHOD_UNDER = "Approximate by dividing all intervals with the approximation constant and shrinking the intervals.";
     private final static String TOOL_TIP_APPROXIMATION_CONSTANT = "Choose approximation constant";
 
+    //Tool tips for SMC panel
+    private final static String TOOL_TIP_ANALYSIS_TYPE = "Choose between probability quantitative estimation, qualitative hypothesis testing against a fixed probability, or trace generation.";
+    private final static String TOOL_TIP_TIME_BOUND = "Bound each run by a maximum accumulated delay";
+    private final static String TOOL_TIP_STEP_BOUND = "Bound each run by a maximum number of transition firings";
+    private final static String TOOL_TIP_CONFIDENCE = "Between 0 and 1, confidence that the probability is indeed in the computed interval";
+    private final static String TOOL_TIP_INTERVAL_WIDTH = "Between 0 and 1, error E of the computed probability (P±E)";
+    private final static String TOOL_TIP_FALSE_POSITIVES = "Probability to accept the hypothesis if it is false";
+    private final static String TOOL_TIP_FALSE_NEGATIVES = "Probability to reject the hypothesis if it is true";
+    private final static String TOOL_TIP_INDIFFERENCE = "Width of the indifference region used as a threshold by the algorithm";
+    private final static String TOOL_TIP_VERIFICATION_TIME = "Total estimated time (in seconds) to run the verification with the given confidence and precision";
+    private final static String TOOL_TIP_QUALITATIVE_TEST = "Probability threshold to be tested";
+    private final static String TOOL_TIP_N_TRACES = "Number of traces to be shown";
+    private final static String TOOL_TIP_TRACE_TYPE = "Specifies the type of traces to be shown";
+
+
     private QueryDialog(EscapableDialog me, QueryDialogueOption option, TAPNQuery queryToCreateFrom, TimedArcPetriNetNetwork tapnNetwork, HashMap<TimedArcPetriNet, DataLayer> guiModels, TAPNLens lens, PetriNetTab tab) {
         this.tapnNetwork = tapnNetwork;
         this.guiModels = guiModels;
@@ -427,6 +473,7 @@ private QueryDialog(EscapableDialog me, QueryDialogueOption option, TAPNQuery qu
         init(option, queryToCreateFrom);
         makeShortcuts();
         toggleAdvancedSimpleView(false);
+        if (lens.isStochastic()) toggleSmc();
     }
 
     private boolean checkIfSomeReductionOption() {
@@ -494,8 +541,8 @@ private TAPNQuery getTimedQuery(String name, int capacity, int oldCapacity, Trac
         boolean symmetry = getSymmetry();
 		boolean timeDarts = useTimeDarts.isSelected();
 		boolean pTrie = usePTrie.isSelected();
-		boolean gcd = useGCD.isSelected();
-		boolean overApproximation = skeletonAnalysis.isSelected();
+		boolean gcd = useGCD.isSelected() && !lens.isStochastic();
+		boolean overApproximation = skeletonAnalysis.isSelected() && !lens.isStochastic();
 		boolean reduction = useReduction.isSelected();
 		TAPNQuery query = new TAPNQuery(
             name,
@@ -532,6 +579,22 @@ private TAPNQuery getTimedQuery(String name, int capacity, int oldCapacity, Trac
         if (reductionOptionToSet != null && reductionOptionToSet.equals(ReductionOption.VerifyTAPN)) {
             query.setDiscreteInclusion(discreteInclusion.isSelected());
         }
+
+        if(lens.isStochastic()) {
+            query.setCategory(TAPNQuery.QueryCategory.SMC);
+            query.setParallel(smcParallel.isSelected());
+            VerificationType verificationType = VerificationType.fromOrdinal(smcVerificationType.getSelectedIndex());
+            if (verificationType == VerificationType.SIMULATE) {
+                query.setSmcSettings(SMCSettings.Default());
+            } else {
+                query.setSmcSettings(getSMCSettings());
+            }
+            
+            query.setVerificationType(verificationType);
+            query.setNumberOfTraces((Integer)smcNumberOfTraces.getValue());
+            query.setSmcTraceType((SMCTraceType)smcTraceType.getSelectedItem());
+        }
+
         return query;
     }
 
@@ -686,6 +749,147 @@ private void refreshTraceOptions() {
 		}
 	}
 
+    private void updateSMCSettings() {
+        DecimalFormatSymbols decimalFormatSymbols = DecimalFormatSymbols.getInstance();
+        decimalFormatSymbols.setDecimalSeparator('.');
+        DecimalFormat precisionFormat = new DecimalFormat("#.#####", decimalFormatSymbols);
+        smcSettings.compareToFloat = smcVerificationType.getSelectedIndex() == 1;
+        try {
+            smcSettings.timeBound = smcTimeBoundInfinite.isSelected() ?
+                Integer.MAX_VALUE :
+                Integer.parseInt(smcTimeBoundValue.getText());
+        } catch(NumberFormatException e) {
+            smcSettings.timeBound = 1000;
+            smcTimeBoundValue.setText("1000");
+        }
+        smcTimeBoundValue.setEnabled(!smcTimeBoundInfinite.isSelected() && !doingBenchmark);
+        try {
+            smcSettings.stepBound = smcStepBoundInfinite.isSelected() ?
+                Integer.MAX_VALUE :
+                Integer.parseInt(smcStepBoundValue.getText());
+        } catch(NumberFormatException e) {
+            smcSettings.stepBound = 1000;
+            smcStepBoundValue.setText("1000");
+        }
+        smcStepBoundValue.setEnabled(!smcStepBoundInfinite.isSelected());
+        smcTimeBoundInfinite.setEnabled(!smcStepBoundInfinite.isSelected());
+        smcStepBoundInfinite.setEnabled(!smcTimeBoundInfinite.isSelected());
+        try {
+            smcSettings.confidence = Float.parseFloat(smcConfidence.getText());
+        } catch(NumberFormatException e) {
+            smcConfidence.setText(String.valueOf(smcSettings.confidence));
+        }
+        try {
+            smcSettings.estimationIntervalWidth = (doingBenchmark && !smcMustUpdateTime) ?
+                0.01f : Float.parseFloat(smcEstimationIntervalWidth.getText());
+        } catch(NumberFormatException e) {
+            smcEstimationIntervalWidth.setText(precisionFormat.format(smcSettings.estimationIntervalWidth));
+        }
+        try {
+            smcSettings.falsePositives = Float.parseFloat(smcFalsePositives.getText());
+        } catch(NumberFormatException e) {
+            smcFalsePositives.setText(String.valueOf(smcSettings.falsePositives));
+        }
+        try {
+            smcSettings.falseNegatives = Float.parseFloat(smcFalseNegatives.getText());
+        } catch(NumberFormatException e) {
+            smcFalseNegatives.setText(String.valueOf(smcSettings.falseNegatives));
+        }
+        try {
+            smcSettings.indifferenceWidth = Float.parseFloat(smcIndifference.getText());
+        } catch(NumberFormatException e) {
+            smcIndifference.setText(String.valueOf(smcSettings.indifferenceWidth));
+        }
+        try {
+            smcSettings.geqThan = Float.parseFloat(smcComparisonFloat.getText());
+        } catch(NumberFormatException e) {
+            smcComparisonFloat.setText(String.valueOf(smcSettings.geqThan));
+        }
+    }
+
+    private SMCSettings getSMCSettings() {
+        updateSMCSettings();
+        return smcSettings;
+    }
+
+    private void setSMCSettings(SMCSettings settings) {
+        smcSettings = settings;
+
+        double desiredMinConfidence = smcConfidenceSlider.getDesiredMin();
+        double desiredMaxConfidence = smcConfidenceSlider.getDesiredMax();
+        double initialProportionConfidence = (settings.confidence - desiredMinConfidence) / (desiredMaxConfidence - desiredMinConfidence);
+        int initialValueConfidence = (int) (initialProportionConfidence * smcConfidenceSlider.getMaximum());
+        smcConfidenceSlider.setValue(
+            Math.max(smcConfidenceSlider.getMinimum(), 
+                    Math.min(initialValueConfidence, smcConfidenceSlider.getMaximum())));
+
+        double desiredMinPrecision = smcPrecisionSlider.getDesiredMin();
+        double desiredMaxPrecision = smcPrecisionSlider.getDesiredMax();
+        double logMin = Math.log(desiredMinPrecision);
+        double logMax = Math.log(desiredMaxPrecision);
+        double initialProportionPrecision = (Math.log(settings.estimationIntervalWidth) - logMin) / (logMax - logMin);
+        int initialValuePrecision = (int) (initialProportionPrecision * smcPrecisionSlider.getMaximum());
+        
+        smcPrecisionSlider.setValue(
+            Math.max(smcPrecisionSlider.getMinimum(), 
+                    Math.min(initialValuePrecision, smcPrecisionSlider.getMaximum())));
+        DecimalFormatSymbols decimalFormatSymbols = DecimalFormatSymbols.getInstance();
+        decimalFormatSymbols.setDecimalSeparator('.');
+        DecimalFormat precisionFormat = new DecimalFormat("#.#####", decimalFormatSymbols);
+
+        smcVerificationType.setSelectedIndex(settings.compareToFloat ? 1 : 0);
+        smcTimeBoundValue.setText(smcSettings.timeBound < Integer.MAX_VALUE ?
+            String.valueOf(smcSettings.timeBound) : "");
+        smcTimeBoundInfinite.setSelected(smcSettings.timeBound == Integer.MAX_VALUE);
+        smcTimeBoundValue.setEnabled(!smcTimeBoundInfinite.isSelected() && !doingBenchmark);
+        smcStepBoundValue.setText(smcSettings.stepBound < Integer.MAX_VALUE ?
+            String.valueOf(smcSettings.stepBound) : "");
+        smcStepBoundInfinite.setSelected(smcSettings.stepBound == Integer.MAX_VALUE);
+        smcStepBoundValue.setEnabled(!smcStepBoundInfinite.isSelected());
+        smcTimeBoundInfinite.setEnabled(!smcStepBoundInfinite.isSelected());
+        smcStepBoundInfinite.setEnabled(!smcTimeBoundInfinite.isSelected());
+
+        smcConfidence.setText(String.valueOf(settings.confidence));
+        if(!doingBenchmark) smcEstimationIntervalWidth.setText(precisionFormat.format(settings.estimationIntervalWidth));
+
+        smcFalsePositives.setText(String.valueOf(settings.falsePositives));
+        double desiredMinFalsePositives = smcFalsePositivesSlider.getDesiredMin();
+        double desiredMaxFalsePositives = smcFalsePositivesSlider.getDesiredMax();
+        double initialProportionFalsePositives = (settings.falsePositives - desiredMinFalsePositives) / (desiredMaxFalsePositives - desiredMinFalsePositives);
+        int initialValueFalsePositives = (int) (initialProportionFalsePositives * smcFalsePositivesSlider.getMaximum());
+        smcFalsePositivesSlider.setValue(
+            Math.max(smcFalsePositivesSlider.getMinimum(), 
+                    Math.min(initialValueFalsePositives, smcFalsePositivesSlider.getMaximum())));
+
+        smcFalseNegatives.setText(String.valueOf(settings.falseNegatives));
+        double desiredMinFalseNegatives = smcFalseNegativesSlider.getDesiredMin();
+        double desiredMaxFalseNegatives = smcFalseNegativesSlider.getDesiredMax();
+        double initialProportionFalseNegatives = (settings.falseNegatives - desiredMinFalseNegatives) / (desiredMaxFalseNegatives - desiredMinFalseNegatives);
+        int initialValueFalseNegatives = (int) (initialProportionFalseNegatives * smcFalseNegativesSlider.getMaximum());
+        smcFalseNegativesSlider.setValue(
+            Math.max(smcFalseNegativesSlider.getMinimum(), 
+                    Math.min(initialValueFalseNegatives, smcFalseNegativesSlider.getMaximum())));
+
+        smcIndifference.setText(String.valueOf(settings.indifferenceWidth));
+        double desiredMinIndifference = smcIndifferenceSlider.getDesiredMin();
+        double desiredMaxIndifference = smcIndifferenceSlider.getDesiredMax();
+        double initialProportionIndifference = (settings.indifferenceWidth - desiredMinIndifference) / (desiredMaxIndifference - desiredMinIndifference);
+        int initialValueIndifference = (int) (initialProportionIndifference * smcIndifferenceSlider.getMaximum());
+        smcIndifferenceSlider.setValue(
+            Math.max(smcIndifferenceSlider.getMinimum(), 
+                    Math.min(initialValueIndifference, smcIndifferenceSlider.getMaximum())));
+
+        smcComparisonFloat.setText(String.valueOf(settings.geqThan));
+        double desiredMinComparison = smcComparisonFloatSlider.getDesiredMin();
+        double desiredMaxComparison = smcComparisonFloatSlider.getDesiredMax();
+        double initialProportionComparison = (settings.geqThan - desiredMinComparison) / (desiredMaxComparison - desiredMinComparison);
+
+        int initialValueComparison = (int) (initialProportionComparison * smcComparisonFloatSlider.getMaximum());
+        smcComparisonFloatSlider.setValue(
+            Math.max(smcComparisonFloatSlider.getMinimum(), 
+                    Math.min(initialValueComparison, smcComparisonFloatSlider.getMaximum())));
+    }
+
     private boolean queryIsReachability() {
         return new IsReachabilityVisitor().isReachability(newProperty);
     }
@@ -1071,7 +1275,8 @@ private void setEnabledReductionOptions(){
             (newProperty.toString().contains("EG") || newProperty.toString().contains("AF")) && highestNetDegree > 2,
             newProperty.hasNestedPathQuantifiers(),
             lens.isColored(),
-            lens.isColored() && !lens.isTimed()
+            lens.isColored() && !lens.isTimed(),
+            lens.isStochastic()
         };
 
 
@@ -1119,7 +1324,11 @@ private void setEnabledReductionOptions(){
         if (lens.isTimed()) {
             for (EngineSupportOptions engine : engineSupportOptions) {
                 if (engine.areOptionsSupported(queryOptions)) {
-                    options.add(engine.nameString);
+                    if (engine.getNameString().equals(name_verifyTAPN) && lens.isStochastic()) {
+                        continue;
+                    }
+
+                    options.add(engine.getNameString());
                 }
             }
         } else {
@@ -1325,6 +1534,14 @@ private void enableOnlyStateButtons() {
         if (queryType.getSelectedIndex() == 2) traceBox.setEnabled(traceBox.getModel().getSize() > 0);
     }
 
+    private void enableOnlySMCButtons() {
+        finallyButton.setEnabled(true);
+        globallyButton.setEnabled(true);
+        if(lens.isStochastic()) {
+            updateSMCButtons();
+        }
+    }
+
     private void enableOnlyUntimedStateButtons() {
         existsBox.setEnabled(true);
         existsDiamond.setEnabled(true);
@@ -1539,14 +1756,21 @@ private void init(QueryDialogueOption option, final TAPNQuery queryToCreateFrom)
         initUppaalOptionsPanel();
         initVerificationPanel();
         initOverApproximationPanel();
+        initSmcSettingsPanel();
         initRawVerificationOptionsPanel();
         initButtonPanel(option);
 
+        if (lens.isStochastic()) {
+            setSMCSettings(SMCSettings.Default());
+        }
+
         if (queryToCreateFrom != null) {
             setupFromQuery(queryToCreateFrom);
         }
 
         refreshTraceOptions();
+
+
         setEnabledReductionOptions();
 
         rootPane.setDefaultButton(saveAndVerifyButton);
@@ -1594,6 +1818,14 @@ private void setupFromQuery(TAPNQuery queryToCreateFrom) {
             setupUnfoldingOptionsFromQuery(queryToCreateFrom);
         }
 
+        if (queryToCreateFrom.getCategory() == TAPNQuery.QueryCategory.SMC) {
+            setSMCSettings(queryToCreateFrom.getSmcSettings());
+            smcParallel.setSelected(queryToCreateFrom.isParallel());
+            smcVerificationType.setSelectedIndex(queryToCreateFrom.getVerificationType().ordinal());
+            smcNumberOfTraces.setValue(queryToCreateFrom.getNumberOfTraces());
+            smcTraceType.setSelectedItem(queryToCreateFrom.getSmcTraceType());
+        }
+
         setupQueryCategoryFromQuery(queryToCreateFrom);
         setupSearchOptionsFromQuery(queryToCreateFrom);
         setupReductionOptionsFromQuery(queryToCreateFrom);
@@ -1604,6 +1836,7 @@ private void setupFromQuery(TAPNQuery queryToCreateFrom) {
         if (queryToCreateFrom.getCategory() == TAPNQuery.QueryCategory.HyperLTL) {
             setupTraceListFromQuery(queryToCreateFrom);
         }
+
     }
 
     private void setupRawVerificationOptionsFromQuery(TAPNQuery queryToCreateFrom) {
@@ -1629,6 +1862,29 @@ private void setupRawVerificationOptions(boolean isSelected) {
 
         numberOfExtraTokensInNet.addChangeListener(e -> updateRawVerificationOptions());
         reductionOption.addActionListener(e -> updateRawVerificationOptions());
+        smcVerificationType.addActionListener(e -> updateRawVerificationOptions());
+        smcNumberOfTraces.addChangeListener(e -> updateRawVerificationOptions());
+
+        final JTextField smcNumTracesTextField = ((JSpinner.DefaultEditor) smcNumberOfTraces.getEditor()).getTextField();
+
+        // Fix from https://stackoverflow.com/a/6276603 to update uppon typing
+        // to ensure raw options are updated correctly
+        smcNumTracesTextField.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyReleased(KeyEvent e) {
+                String text = smcNumTracesTextField.getText().replace(",", "");
+                int oldCaretPos = smcNumTracesTextField.getCaretPosition();
+                try {
+                    Integer newValue = Integer.valueOf(text);
+                    smcNumberOfTraces.setValue(newValue);
+                    smcNumTracesTextField.setCaretPosition(oldCaretPos);
+                } catch(NumberFormatException ex) {
+                    // Not a number in text field -> do nothing
+                }
+            }
+        });
+
+        smcTraceType.addActionListener(e -> updateRawVerificationOptions());
         
         if (reductionOption.getSelectedItem() != null) {
             updateRawVerificationOptions();
@@ -1826,7 +2082,7 @@ public void changedUpdate(DocumentEvent e) {
             }
         });
 
-        queryType = new JComboBox(new String[]{"CTL/Reachability", "LTL","HyperLTL"});
+        queryType = new JComboBox(new String[]{"CTL/Reachability", "LTL", "HyperLTL"});
         queryType.setToolTipText(TOOL_TIP_QUERY_TYPE);
         queryType.addActionListener(arg0 -> toggleDialogType());
 
@@ -1890,6 +2146,15 @@ private String getHelpMessage(){
                     "<b>Approximation Options</b><br/>" +
                     "TAPAAL allows to approximate the time intervals on edges by dividing them by the given approximation constant and either enlarging the resulting intervals (over-approximation) or shrinking them (under-approximation). The larger the constant is, the faster is the verification but the more often the user can get an inconclusive answer." +
                     "<br/>" +
+                    "<b>SMC Options</b><br/>" +
+                    "Statistical model-checking simulates random runs in order to verify how often a property is satisfied. It explores random runs that do not exceed the given time and step bound. " +
+                    "There are three types of SMC queries :" +
+                    "<ul>" +
+                    "<li>The quantitative probability estimation performs a Monte-Carlo algorithm to produce an estimation of the probability of an event happening. The number of runs to execute is defined by the desired confidence and precision, which are the confidence that the real probability is in an interval of ± the precision around the estimation.</li>" +
+                    "<li>The qualitative probability testing performs a SPRT test, to produce an estimation whether the probability of an event happening is greater than a real constant C. According to the result of each run, a ratio is updated and a result is decided once it reaches a bound. The false-positives parameter is the probability of estimating the test to be true when it isn't, the false-negatives parameter is the opposite, and the indifference region is the zone C ± width, which bounds are used as thresholds.</li>" +
+                    "<li>The simulate mode generates an arbitrary number of random traces, that can then be explored in the simulator. The traces could be restricted to : any trace, only traces satisfying the property, or only traces violating the property. This mode must be used carefully, because in some cases it may not terminate : if asking for 5 traces satisfying the property, but no runs ever satisfy the property, then the algorithm will run forever.</li>" +
+                    "<ul/>" +
+                    "<br/>" +
                     "</html>";
             }
         });
@@ -1925,18 +2190,20 @@ private void toggleAdvancedSimpleView(boolean changeState){
             setAdvancedView(!advancedView);
         }
 
+        boolean isSmc = lens.isStochastic();
+
         Point location = guiDialog.getLocation();
 
-        searchOptionsPanel.setVisible(advancedView);
+        searchOptionsPanel.setVisible(advancedView && !isSmc);
         if(lens.isColored() && !lens.isTimed()){
             unfoldingOptionsPanel.setVisible(advancedView);
         }
 
-        reductionOptionsPanel.setVisible(advancedView);
+        reductionOptionsPanel.setVisible(advancedView && !isSmc);
         if (lens.isTimed()) {
-            saveUppaalXMLButton.setVisible(advancedView);
+            saveUppaalXMLButton.setVisible(advancedView && !isSmc);
             // Disabled approximation options for colored models, because they are not supported yet (will generate error)
-            overApproximationOptionsPanel.setVisible(advancedView);
+            overApproximationOptionsPanel.setVisible(advancedView && !isSmc);
         } else if (!lens.isGame()){
             openReducedNetButton.setVisible(advancedView);
         }
@@ -2052,6 +2319,32 @@ private void toggleDialogType() {
         updateRawVerificationOptions();
     }
 
+    private void toggleSmc() {
+        if(lens.isStochastic()) {
+            showSMCButtons(true);
+            reductionOption.setSelectedItem(name_DISCRETE);
+            useGCD.setSelected(false);
+            reductionOption.setEnabled(false);
+            traceOptionsPanel.setVisible(false);
+            boundednessCheckPanel.setVisible(false);
+            smcSettingsPanel.setVisible(true);
+            toggleAdvancedSimpleView(false);
+            queryChanged();
+        } else {
+            showSMCButtons(false);
+            reductionOption.setEnabled(true);
+            traceOptionsPanel.setVisible(true);
+            boundednessCheckPanel.setVisible(true);
+            smcSettingsPanel.setVisible(false);
+            toggleAdvancedSimpleView(false);
+            queryChanged();
+        }
+
+        if (undoManager != null) undoManager.discardAllEdits();
+        if (undoButton != null) undoButton.setEnabled(false);
+        if (redoButton != null) redoButton.setEnabled(false);
+    }
+
     private boolean isValidLTL() {
         String queryText = queryField.getText().trim();
         return queryText.startsWith("A") || queryText.startsWith("E");
@@ -2485,6 +2778,322 @@ private void initBoundednessCheckPanel() {
         uppaalOptionsPanel.add(boundednessCheckPanel, gridBagConstraints);
     }
 
+    private void initSmcSettingsPanel() {
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.anchor = GridBagConstraints.NORTH;
+        gbc.fill = GridBagConstraints.VERTICAL;
+        gbc.insets = new Insets(0,5,0,5);
+        GridBagConstraints subPanelGbc = new GridBagConstraints();
+        subPanelGbc.anchor = GridBagConstraints.WEST;
+        subPanelGbc.insets = new Insets(0,5,0,5);
+
+        FocusListener updater = new FocusListener() {
+            public void focusGained(FocusEvent focusEvent) { }
+            public void focusLost(FocusEvent focusEvent) {
+                updateSMCSettings();
+            }
+        };
+
+        smcSettingsPanel = new JPanel();
+        smcSettingsPanel.setLayout(new GridBagLayout());
+        smcSettingsPanel.setVisible(false);
+        smcSettingsPanel.setBorder(BorderFactory.createTitledBorder("SMC Options"));
+        gbc.gridy = 0;
+        gbc.gridx = 0;
+
+        JPanel smcEngineOptions = new JPanel();
+        smcEngineOptions.setLayout(new GridBagLayout());
+        smcEngineOptions.setBorder(BorderFactory.createTitledBorder("SMC engine options"));
+        subPanelGbc.gridy = 0;
+        subPanelGbc.gridx = 0;
+        smcVerificationTypeLabel = new JLabel("Verification type : ");
+        smcEngineOptions.add(smcVerificationTypeLabel, subPanelGbc);
+        subPanelGbc.gridx = 1;
+        subPanelGbc.fill = GridBagConstraints.HORIZONTAL;
+        subPanelGbc.gridwidth = 2;
+        smcVerificationType = new JComboBox<>(new String[]{ "Quantitative", "Qualitative", "Simulate" });
+        smcVerificationType.setToolTipText(TOOL_TIP_ANALYSIS_TYPE);
+        smcEngineOptions.add(smcVerificationType, subPanelGbc);
+        subPanelGbc.fill = GridBagConstraints.NONE;
+        subPanelGbc.gridwidth = 1;
+        subPanelGbc.gridy = 1;
+        subPanelGbc.gridx = 0;
+        JLabel timeBoundLabel = new JLabel("Time bound : ");
+        timeBoundLabel.setToolTipText(TOOL_TIP_TIME_BOUND);
+        smcEngineOptions.add(timeBoundLabel, subPanelGbc);
+        subPanelGbc.gridx = 1;
+        subPanelGbc.fill = GridBagConstraints.HORIZONTAL;
+        smcTimeBoundValue = new JTextField(7);
+        smcTimeBoundValue.setToolTipText(TOOL_TIP_TIME_BOUND);
+        smcEngineOptions.add(smcTimeBoundValue, subPanelGbc);
+        smcTimeBoundValue.addFocusListener(updater);
+        subPanelGbc.fill = GridBagConstraints.NONE;
+        subPanelGbc.gridx = 2;
+        smcTimeBoundInfinite = new JCheckBox(Character.toString('∞'));
+        smcTimeBoundInfinite.addActionListener(evt -> updateSMCSettings());
+        smcEngineOptions.add(smcTimeBoundInfinite, subPanelGbc);
+
+        subPanelGbc.gridy = 2;
+        subPanelGbc.gridx = 0;
+        JLabel stepBoundLabel = new JLabel("Step bound : ");
+        stepBoundLabel.setToolTipText(TOOL_TIP_STEP_BOUND);
+        smcEngineOptions.add(stepBoundLabel, subPanelGbc);
+        subPanelGbc.gridx = 1;
+        subPanelGbc.fill = GridBagConstraints.HORIZONTAL;
+        smcStepBoundValue = new JTextField(7);
+        smcStepBoundValue.setToolTipText(TOOL_TIP_STEP_BOUND);
+        smcEngineOptions.add(smcStepBoundValue, subPanelGbc);
+        smcStepBoundValue.addFocusListener(updater);
+        subPanelGbc.fill = GridBagConstraints.NONE;
+        subPanelGbc.gridx = 2;
+        smcStepBoundInfinite = new JCheckBox(Character.toString('∞'));
+        smcStepBoundInfinite.addActionListener(evt -> updateSMCSettings());
+        smcEngineOptions.add(smcStepBoundInfinite, subPanelGbc);
+
+        subPanelGbc.gridy = 3;
+        subPanelGbc.gridx = 0;
+        smcParallelLabel = new JLabel("Use all available cores : ");
+        smcEngineOptions.add(smcParallelLabel, subPanelGbc);
+        subPanelGbc.gridx = 1;
+        smcParallel = new JCheckBox();
+        smcEngineOptions.add(smcParallel, subPanelGbc);
+
+        smcSettingsPanel.add(smcEngineOptions, gbc);
+        gbc.gridx = 1;
+
+        subPanelGbc.gridx = 0;
+        subPanelGbc.gridy = 0;
+        subPanelGbc.gridwidth = 1;
+        quantitativePanel = new JPanel();
+        quantitativePanel.setLayout(new GridBagLayout());
+        quantitativePanel.setBorder(BorderFactory.createTitledBorder("Quantitative estimation options"));
+        subPanelGbc.gridy = 0;
+        subPanelGbc.gridx = 0;
+        quantitativePanel.add(new JLabel("Confidence : "), subPanelGbc);
+        subPanelGbc.gridx = 1;
+        smcConfidence = new JTextField(7);
+        smcConfidence.addFocusListener(updater);
+        smcConfidence.setToolTipText(TOOL_TIP_CONFIDENCE);
+        quantitativePanel.add(smcConfidence, subPanelGbc);
+        subPanelGbc.gridx = 2;
+        smcConfidenceSlider = new QuerySlider(95, 0.80, 0.99);
+        smcConfidenceSlider.setToolTipText("Value: 0.95");
+        smcConfidenceSlider.addChangeListener(e -> {
+            int value = smcConfidenceSlider.getValue();
+            double desiredMin = smcConfidenceSlider.getDesiredMin();
+            double desiredMax = smcConfidenceSlider.getDesiredMax();
+            double proportion = (double) value / smcConfidenceSlider.getMaximum();
+            double interpretedValue = desiredMin + proportion * (desiredMax - desiredMin);
+            double roundedValue = Math.round(interpretedValue * 100.0) / 100.0;
+            smcConfidence.setText(roundedValue + "");
+            smcConfidenceSlider.setRealValue(roundedValue);
+            smcConfidenceSlider.setToolTipText(String.format("Value: %.2f", roundedValue));
+            smcMustUpdateTime = true;
+        });
+
+        quantitativePanel.add(smcConfidenceSlider, subPanelGbc);
+        subPanelGbc.gridy = 1;
+        subPanelGbc.gridx = 0;
+        quantitativePanel.add(new JLabel("Precision : "), subPanelGbc);
+        subPanelGbc.gridx = 1;
+        smcEstimationIntervalWidth = new JTextField(7);
+        smcEstimationIntervalWidth.addFocusListener(updater);
+        smcEstimationIntervalWidth.setToolTipText(TOOL_TIP_INTERVAL_WIDTH);
+        quantitativePanel.add(smcEstimationIntervalWidth, subPanelGbc);
+        subPanelGbc.gridx = 2;
+        smcPrecisionSlider = new QuerySlider(0, 0.5, 0.0001);
+        smcPrecisionSlider.setToolTipText("Value: 0.5000");
+        smcPrecisionSlider.addChangeListener(e -> {
+            int value = smcPrecisionSlider.getValue();
+            double desiredMin = smcPrecisionSlider.getDesiredMin();
+            double desiredMax = smcPrecisionSlider.getDesiredMax();
+            double logMin = Math.log(desiredMin);
+            double logMax = Math.log(desiredMax);
+            double proportion = (double) value / smcPrecisionSlider.getMaximum();
+            double logValue = logMin + proportion * (logMax - logMin);
+            double interpretedValue = Math.exp(logValue);
+            smcPrecisionSlider.setRealValue(interpretedValue);
+            double roundedValue = Math.round(interpretedValue * 10000.0) / 10000.0;
+            DecimalFormat df = new DecimalFormat("#.####");
+            String formattedValue = df.format(roundedValue);
+            smcEstimationIntervalWidth.setText(formattedValue);
+            smcPrecisionSlider.setToolTipText(String.format("Value: %s", formattedValue));
+            smcMustUpdateTime = true;
+        });
+
+        quantitativePanel.add(smcPrecisionSlider, subPanelGbc);
+        subPanelGbc.gridy = 2;
+        subPanelGbc.gridx = 0;
+        JLabel verifTimeLabel = new JLabel("Estimated verification time (seconds) : ");
+        verifTimeLabel.setToolTipText(TOOL_TIP_VERIFICATION_TIME);
+        quantitativePanel.add(verifTimeLabel, subPanelGbc);
+        subPanelGbc.gridx = 1;
+        smcTimeExpected = new JTextField(7);
+        smcTimeExpected.setToolTipText(TOOL_TIP_VERIFICATION_TIME);
+        quantitativePanel.add(smcTimeExpected, subPanelGbc);
+
+        smcEstimatedTimeSlider = new QuerySlider(0, 1, 100, 99);
+        smcEstimatedTimeSlider.setToolTipText("Value: 1.0");
+        smcEstimatedTimeSlider.addChangeListener(e -> {
+            int value = smcEstimatedTimeSlider.getValue();
+            double desiredMin = smcEstimatedTimeSlider.getDesiredMin();
+            double desiredMax = smcEstimatedTimeSlider.getDesiredMax();
+            double proportion = (double) value / smcEstimatedTimeSlider.getMaximum();
+            double interpretedValue = desiredMin + proportion * (desiredMax - desiredMin);
+            double roundedValue = Math.round(interpretedValue);
+            smcTimeExpected.setText(roundedValue + "");
+            smcEstimatedTimeSlider.setRealValue(roundedValue);
+            smcEstimatedTimeSlider.setToolTipText(String.format("Value: %.1f", roundedValue));
+            smcMustUpdateTime = false;
+        });
+
+        subPanelGbc.gridx = 2;
+        quantitativePanel.add(smcEstimatedTimeSlider, subPanelGbc);
+
+        subPanelGbc.gridy = 3;
+        subPanelGbc.gridx = 0;
+        subPanelGbc.gridwidth = 2;
+        subPanelGbc.fill = GridBagConstraints.HORIZONTAL;
+        smcTimeEstimationButton = new JButton(UPDATE_VERIFICATION_TIME_BTN_TEXT);
+        smcTimeEstimationButton.setPreferredSize(new Dimension(378, 25));
+        smcTimeEstimationButton.addActionListener(evt -> {
+            runBenchmark();
+        });
+        quantitativePanel.add(smcTimeEstimationButton, subPanelGbc);
+
+        gbc.fill = GridBagConstraints.BOTH;
+        gbc.weightx = 1;
+        smcSettingsPanel.add(quantitativePanel, gbc);
+
+        subPanelGbc.gridwidth = 1;
+        subPanelGbc.anchor = GridBagConstraints.WEST;
+        qualitativePanel = new JPanel();
+        qualitativePanel.setLayout(new GridBagLayout());
+        qualitativePanel.setBorder(BorderFactory.createTitledBorder("Qualitative estimation options"));
+        qualitativePanel.setVisible(false);
+        subPanelGbc.gridy = 0;
+        subPanelGbc.gridx = 0;
+        qualitativePanel.add(new JLabel("False positives : "), subPanelGbc);
+        subPanelGbc.gridx = 1;
+        smcFalsePositives = new JTextField(7);
+        smcFalsePositives.addFocusListener(updater);
+        smcFalsePositives.setToolTipText(TOOL_TIP_FALSE_POSITIVES);
+        qualitativePanel.add(smcFalsePositives, subPanelGbc);
+        subPanelGbc.gridx = 2;
+        smcFalsePositivesSlider = new QuerySlider(0, 0.001, 0.5);
+        smcFalsePositivesSlider.setToolTipText("Value: 0.001");
+        smcFalsePositivesSlider.addChangeListener(e -> smcFalsePositivesSlider.updateValue(smcFalsePositives, 3));
+        qualitativePanel.add(smcFalsePositivesSlider, subPanelGbc);
+        subPanelGbc.gridy = 1;
+        subPanelGbc.gridx = 0;
+        qualitativePanel.add(new JLabel("False negatives : "), subPanelGbc);
+        subPanelGbc.gridx = 1;
+        smcFalseNegatives = new JTextField(7);
+        smcFalseNegatives.addFocusListener(updater);
+        smcFalseNegatives.setToolTipText(TOOL_TIP_FALSE_NEGATIVES);
+        qualitativePanel.add(smcFalseNegatives, subPanelGbc);
+        subPanelGbc.gridx = 2;
+        smcFalseNegativesSlider = new QuerySlider(0, 0.001, 0.5);
+        smcFalseNegativesSlider.setToolTipText("Value: 0.001");
+        smcFalseNegativesSlider.addChangeListener(e -> smcFalseNegativesSlider.updateValue(smcFalseNegatives, 3));
+        qualitativePanel.add(smcFalseNegativesSlider, subPanelGbc);
+        subPanelGbc.gridy = 2;
+        subPanelGbc.gridx = 0;
+        qualitativePanel.add(new JLabel("Indifference region width : "), subPanelGbc);
+        subPanelGbc.gridx = 1;
+        smcIndifference = new JTextField(7);
+        smcIndifference.addFocusListener(updater);
+        smcIndifference.setToolTipText(TOOL_TIP_INDIFFERENCE);
+        qualitativePanel.add(smcIndifference, subPanelGbc);
+        subPanelGbc.gridx = 2;
+        smcIndifferenceSlider = new QuerySlider(100, 0.001, 0.5);
+        smcIndifferenceSlider.setToolTipText("Value: 0.500");
+        smcIndifferenceSlider.addChangeListener(e -> smcIndifferenceSlider.updateValue(smcIndifference, 3));
+        qualitativePanel.add(smcIndifferenceSlider, subPanelGbc);
+        subPanelGbc.gridy = 3;
+        subPanelGbc.gridx = 0;
+        JLabel testLabel = new JLabel("Property hold with probability >= ");
+        testLabel.setToolTipText(TOOL_TIP_QUALITATIVE_TEST);
+        qualitativePanel.add(testLabel, subPanelGbc);
+        subPanelGbc.gridx = 1;
+        smcComparisonFloat = new JTextField(7);
+        smcComparisonFloat.setToolTipText(TOOL_TIP_QUALITATIVE_TEST);
+        smcComparisonFloat.addFocusListener(updater);
+        qualitativePanel.add(smcComparisonFloat, subPanelGbc);
+        subPanelGbc.gridx = 2;
+        smcComparisonFloatSlider = new QuerySlider(50, 0.01, 0.99, 98);
+        smcComparisonFloatSlider.setToolTipText("Value: 0.50");
+        smcComparisonFloatSlider.addChangeListener(e -> smcComparisonFloatSlider.updateValue(smcComparisonFloat, 2));
+        qualitativePanel.add(smcComparisonFloatSlider, subPanelGbc);
+
+        smcSettingsPanel.add(qualitativePanel, gbc);
+    
+        smcTracePanel = new JPanel();
+        smcTracePanel.setLayout(new GridBagLayout());
+        smcTracePanel.setBorder(BorderFactory.createTitledBorder("Trace options"));
+        smcTracePanel.setVisible(false);
+        subPanelGbc.gridy = 0;
+        subPanelGbc.gridx = 0;
+        JLabel numberOfTracesLabel = new JLabel("Number of traces : ");
+        numberOfTracesLabel.setToolTipText(TOOL_TIP_N_TRACES);
+        smcTracePanel.add(numberOfTracesLabel, subPanelGbc);
+        subPanelGbc.gridx = 1;
+        smcNumberOfTraces = new CustomJSpinner(1, 1, Integer.MAX_VALUE);
+        smcNumberOfTraces.addFocusListener(updater);
+        smcNumberOfTraces.setToolTipText(TOOL_TIP_N_TRACES);
+        smcTracePanel.add(smcNumberOfTraces, subPanelGbc);
+        subPanelGbc.gridy = 1;
+        smcTracePanel.add(Box.createVerticalStrut(5), subPanelGbc);
+        JLabel traceTypeLabel = new JLabel("Trace type : ");
+        traceTypeLabel.setToolTipText(TOOL_TIP_TRACE_TYPE);
+        subPanelGbc.gridx = 0;
+        subPanelGbc.gridy = 2;
+        smcTracePanel.add(traceTypeLabel, subPanelGbc);
+        subPanelGbc.gridx = 1;
+        smcTraceType = new JComboBox<>(new SMCTraceType[]{ new SMCTraceType("Any"), 
+                                                           new SMCTraceType("Satisfied"), 
+                                                           new SMCTraceType("Not satisfied") });
+        smcTraceType.setToolTipText(TOOL_TIP_TRACE_TYPE);
+        smcTracePanel.add(smcTraceType, subPanelGbc);
+  
+        smcSettingsPanel.add(smcTracePanel, gbc);
+
+        smcVerificationType.addActionListener(evt -> {
+            boolean quantitative = smcVerificationType.getSelectedIndex() == 0;
+            boolean qualitative = smcVerificationType.getSelectedIndex() == 1;
+            boolean simulate = smcVerificationType.getSelectedIndex() == 2;
+
+            quantitativePanel.setVisible(quantitative);
+            qualitativePanel.setVisible(qualitative);
+            smcTracePanel.setVisible(simulate);
+
+            guiDialog.pack();
+        });
+
+        GridBagConstraints gridBagConstraints = new GridBagConstraints();
+        gridBagConstraints.gridx = 0;
+        gridBagConstraints.gridy = 3;
+        gridBagConstraints.anchor = GridBagConstraints.WEST;
+        gridBagConstraints.insets = new Insets(5,10,5,10);
+        gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
+        gridBagConstraints.weightx = 1;
+        add(smcSettingsPanel, gridBagConstraints);
+
+        Dimension quantitativeSize = quantitativePanel.getPreferredSize();
+        Dimension qualitativeSize = qualitativePanel.getPreferredSize();
+        Dimension smcTraceSize = smcTracePanel.getPreferredSize();
+
+        int maxWidth = Math.max(quantitativeSize.width, Math.max(qualitativeSize.width, smcTraceSize.width));
+        int maxHeight = Math.max(quantitativeSize.height, Math.max(qualitativeSize.height, smcTraceSize.height));
+        Dimension largestSize = new Dimension(maxWidth, maxHeight);
+        
+        quantitativePanel.setPreferredSize(largestSize);
+        qualitativePanel.setPreferredSize(largestSize);
+        smcTracePanel.setPreferredSize(largestSize);
+
+        setupEstimationListeners();
+    }
+
     private void initQueryPanel() {
         queryPanel = new JPanel(new GridBagLayout());
         queryPanel.setBorder(BorderFactory.createTitledBorder("Query (click on the part of the query you want to change)"));
@@ -2502,8 +3111,6 @@ private void initQueryPanel() {
         gbc.fill = GridBagConstraints.BOTH;
         gbc.anchor = GridBagConstraints.WEST;
         add(queryPanel, gbc);
-
-
     }
 
     private void initQueryField() {
@@ -2707,6 +3314,9 @@ private void initQuantificationPanel() {
 
         if (lens.isTimed()|| lens.isGame()) {
             addTimedQuantificationListeners();
+            if(lens.isStochastic()) {
+                addSmcQuantificationListerners();
+            }
             showLTLButtons(false);
             showHyperLTLButtons(false);
         } else {
@@ -2747,6 +3357,18 @@ private void addTimedQuantificationListeners() {
         });
     }
 
+    private void addSmcQuantificationListerners() {
+        finallyButton.addActionListener(e -> {
+            LTLFNode property = new LTLFNode(getSpecificChildOfProperty(1, currentSelection.getObject()));
+            addPropertyToQuery(property);
+        });
+
+        globallyButton.addActionListener(e -> {
+            LTLGNode property = new LTLGNode(getSpecificChildOfProperty(1, currentSelection.getObject()));
+            addPropertyToQuery(property);
+        });
+    }
+
     private void unselectButtons() {
         existsDiamond.setSelected(false);
         existsBox.setSelected(false);
@@ -2944,6 +3566,13 @@ private void showCTLButtons(boolean isVisible) {
         existsUntil.setVisible(isVisible);
     }
 
+    private void showSMCButtons(boolean isVisible) {
+        showCTLButtons(!isVisible);
+        globallyButton.setVisible(isVisible);
+        finallyButton.setVisible(isVisible);
+        deadLockPredicateButton.setVisible(isVisible);
+    }
+
     private void updateSiphonTrap(boolean isCTL) {
         useSiphonTrap.setEnabled(isCTL);
     }
@@ -3971,6 +4600,8 @@ private void initQueryEditingPanel() {
                             returnFromManualEdit(null);
                         else
                             return;
+                    } else if(lens.isStochastic()) {
+                        newQuery = TAPAALSMCQueryParser.parse(queryField.getText());
                     } else if (lens.isTimed()) {
                         newQuery = TAPAALQueryParser.parse(queryField.getText());
                     } else if (queryType.getSelectedIndex() == 0) {
@@ -4456,6 +5087,7 @@ private void initReductionOptionsPanel() {
         reductionOption.setToolTipText(TOOL_TIP_REDUCTION_OPTION);
 
         reductionOption.addActionListener(e -> setEnabledOptionsAccordingToCurrentReduction());
+
         reductionOption.addItemListener(new ItemListener() {
             @Override
             public void itemStateChanged(ItemEvent e) {
@@ -4714,6 +5346,12 @@ private void setVerificationOptionsEnabled(boolean isEnabled) {
         setAllEnabled(traceOptionsPanel, isEnabled);
         setAllEnabled(boundednessCheckPanel, isEnabled);
         setAllEnabled(searchOptionsPanel, isEnabled);
+        setAllEnabled(smcTracePanel, isEnabled);
+
+        smcVerificationTypeLabel.setEnabled(isEnabled);
+        smcVerificationType.setEnabled(isEnabled);
+        smcParallelLabel.setEnabled(isEnabled);
+        smcParallel.setEnabled(isEnabled);
 
         setEnabledOptionsAccordingToCurrentReduction();
     }
@@ -4892,6 +5530,7 @@ private void refreshExportButtonText() {
     }
 
 	private void refreshQueryEditingButtons() {
+        boolean isSmc = lens.isStochastic();
 		if (currentSelection != null) {
             if (lens.isGame()) {
                 if (currentSelection.getObject() instanceof TCTLAbstractPathProperty) {
@@ -4900,13 +5539,22 @@ private void refreshQueryEditingButtons() {
                 } else if (currentSelection.getObject() instanceof TCTLAbstractStateProperty) {
                     enableOnlyStateButtons();
                 }
-            } else if (lens.isTimed()) {
+            } else if (lens.isTimed() && !isSmc) {
                 if (currentSelection.getObject() instanceof TCTLAbstractPathProperty) {
                     enableOnlyPathButtons();
                 } else if (currentSelection.getObject() instanceof TCTLAbstractStateProperty) {
                     enableOnlyStateButtons();
                 }
                 updateQueryButtonsAccordingToSelection();
+            } else if(isSmc) {
+                if (currentSelection.getObject() instanceof TCTLAbstractPathProperty) {
+                    enableOnlySMCButtons();
+                } else if (currentSelection.getObject() instanceof TCTLAbstractStateProperty) {
+                    enableOnlyStateButtons();
+                    finallyButton.setEnabled(false);
+                    globallyButton.setEnabled(false);
+                }
+                updateQueryButtonsAccordingToSelection();
             } else {
                 enableOnlyUntimedStateButtons();
                 updateQueryButtonsAccordingToSelection();
@@ -5122,16 +5770,32 @@ private void updateLTLButtons() {
         }
     }
 
+    private void updateSMCButtons() {
+        if (currentSelection != null && currentSelection.getObject() == newProperty) {
+            String ltlType = checkLTLType();
+            if (ltlType.equals("placeholder")) {
+                finallyButton.setEnabled(true);
+                globallyButton.setEnabled(true);
+            }
+        } else {
+            finallyButton.setEnabled(false);
+            globallyButton.setEnabled(false);
+        }
+    }
+
 
     private void queryChanged(){
         setEnabledReductionOptions();
         if (lens.isTimed()) refreshOverApproximationOption();
         int selectedIndex = queryType.getSelectedIndex();
+        boolean isSmc = lens.isStochastic();
         if (selectedIndex == 1) {
             updateLTLButtons();
         } else if (selectedIndex == 2) {
             updateHyperLTLButtons();
             updateTraceBox();
+        } else if (isSmc) {
+            updateSMCButtons();
         }
     }
 
@@ -5181,11 +5845,17 @@ public void actionPerformed(ActionEvent evt) {
             saveAndVerifyButton.addActionListener(evt -> {
                 updateRawVerificationOptions();
                 if (checkIfSomeReductionOption()) {
+                    if (lens.isStochastic() && !tapnNetwork.isNonStrict()) {
+                        JOptionPane.showMessageDialog(QueryDialog.this, "The model has strict intervals and can therefore not be verified", "Error", JOptionPane.ERROR_MESSAGE);
+                        return;
+                    }
+
                     querySaved = true;
                     // Now if a query is saved and verified, the net is marked as modified
                     tab.setNetChanged(true);
                     exit();
                     TAPNQuery query = getQuery();
+                    
                     if (query.getReductionOption() == ReductionOption.VerifyTAPN || query.getReductionOption() == ReductionOption.VerifyDTAPN || query.getReductionOption() == ReductionOption.VerifyPN) {
                         Verifier.runVerifyTAPNVerification(tapnNetwork, query, null, guiModels,false, lens);
                     } else {
@@ -5320,7 +5990,7 @@ else if (underApproximationEnable.isSelected()) {
                     }
 
                     exit();
-
+                   
                     Verifier.runVerifyTAPNVerification(tapnNetwork, query,null, guiModels, true, null);
 
                     File reducedNetFile = new File(Verifier.getReducedNetFilePath());
@@ -5402,7 +6072,7 @@ private void exportTACPN(Tuple<TimedArcPetriNet, NameMapping> transformedModel,
         }
         // guimodel not working
         //templates.add(new Template(transformedModel.value1(), null, new Zoomer()));
-        TimedArcPetriNetNetworkWriter writerTACPN = new TimedArcPetriNetNetworkWriter(QueryDialog.this.tapnNetwork, templates, queries, QueryDialog.this.tapnNetwork.constants());
+        TimedArcPetriNetNetworkWriter writerTACPN = new TimedArcPetriNetNetworkWriter(QueryDialog.this.tapnNetwork, templates, queries, QueryDialog.this.tapnNetwork.constants(), lens);
         try {
             writerTACPN.savePNML(new File(xmlFile));
         } catch (IOException | ParserConfigurationException | TransformerException exception) {
@@ -5492,4 +6162,139 @@ private void makeShortcuts(){
         im.put(KeyStroke.getKeyStroke('Y', shortcutkey), "redo");
     }
 
+    private void setupEstimationListeners() {
+        DocumentListener needUpdateTime = new DocumentListener() {
+            @Override
+            public void insertUpdate(DocumentEvent documentEvent) {
+                update();
+            }
+            @Override
+            public void removeUpdate(DocumentEvent documentEvent) {
+                update();
+            }
+            @Override
+            public void changedUpdate(DocumentEvent documentEvent) {
+                update();
+            }
+            public void update() {
+                if(!smcEstimationIntervalWidth.hasFocus() && !smcConfidence.hasFocus()) return;
+                smcMustUpdateTime = true;
+                smcTimeExpected.setText("");
+                smcTimeEstimationButton.setText(UPDATE_VERIFICATION_TIME_BTN_TEXT);
+                try {
+                    Float.parseFloat(smcEstimationIntervalWidth.getText());
+                    smcTimeEstimationButton.setEnabled(true);
+                } catch(NumberFormatException e) {
+                    smcTimeEstimationButton.setEnabled(false);
+                }
+            }
+        };
+        smcEstimationIntervalWidth.getDocument().addDocumentListener(needUpdateTime);
+        smcConfidence.getDocument().addDocumentListener(needUpdateTime);
+        smcTimeExpected.getDocument().addDocumentListener(new DocumentListener() {
+            @Override
+            public void insertUpdate(DocumentEvent documentEvent) {
+                update();
+            }
+            @Override
+            public void removeUpdate(DocumentEvent documentEvent) {
+                update();
+            }
+            @Override
+            public void changedUpdate(DocumentEvent documentEvent) {
+                update();
+            }
+            public void update() {
+                if(!smcTimeExpected.hasFocus()) return;
+                smcMustUpdateTime = false;
+                smcEstimationIntervalWidth.setText("");
+                smcTimeEstimationButton.setText(UPDATE_PRECISION_BTN_TEXT);
+                try {
+                    Double.parseDouble(smcTimeExpected.getText());
+                    smcTimeEstimationButton.setEnabled(true);
+                } catch(NumberFormatException e) {
+                    smcTimeEstimationButton.setEnabled(false);
+                }
+            }
+        });
+    }
+
+    private void runBenchmark() {
+        DecimalFormatSymbols decimalFormatSymbols = DecimalFormatSymbols.getInstance();
+        decimalFormatSymbols.setDecimalSeparator('.');
+        DecimalFormat precisionFormat = new DecimalFormat("#.#####", decimalFormatSymbols);
+        DecimalFormat timeFormat = new DecimalFormat("#.##", decimalFormatSymbols);
+        if(doingBenchmark) {
+            if(benchmarkThread == null) return;
+            benchmarkThread.cancel(true);
+            doingBenchmark = false;
+            updateFieldsOnBenchmark();
+            smcTimeEstimationButton.setText(smcMustUpdateTime ? UPDATE_VERIFICATION_TIME_BTN_TEXT : UPDATE_PRECISION_BTN_TEXT);
+            return;
+        }
+        doingBenchmark = true;
+        updateFieldsOnBenchmark();
+        smcTimeEstimationButton.setText("Interrupt estimation");
+        boolean saved = querySaved;
+        querySaved = true;
+        TAPNQuery query = getQuery();
+        querySaved = saved;
+        SMCSettings settings = query.getSmcSettings();
+        query.setBenchmarkMode(true);
+        query.setBenchmarkRuns(48);
+        double timeWanted = 10;
+        try {
+            timeWanted = Double.parseDouble(smcTimeExpected.getText());
+        } catch(NumberFormatException ignored) { }
+        smcTimeExpected.setText("");
+        smcEstimationIntervalWidth.setText("");
+        double finalTimeWanted = timeWanted;
+        VerificationCallback callback1 = result1 -> {
+            query.setBenchmarkRuns(128);
+            SMCStats stats1 = (SMCStats) result1.stats();
+            float runsDone1 = stats1.getExecutedRuns();
+            float time1 = stats1.getVerificationTime();
+            VerificationCallback callback2 = result2 -> {
+                doingBenchmark = false;
+                updateFieldsOnBenchmark();
+                SMCStats stats2 = (SMCStats) result2.stats();
+                float runsDone2 = stats2.getExecutedRuns();
+                float time2 = stats2.getVerificationTime();
+                float coeff = (time2 - time1) / (runsDone2 - runsDone1);
+                float stat_err = time1 - coeff * runsDone1;
+                if(smcMustUpdateTime) {
+                    double runsNeeded = (double) settings.chernoffHoeffdingBound();
+                    double estimation = coeff * runsNeeded + stat_err;
+                    if(estimation < 0) estimation = 0.01;
+                    smcTimeExpected.setText(timeFormat.format(estimation));
+                    smcEstimationIntervalWidth.setText(precisionFormat.format(smcSettings.estimationIntervalWidth));
+                    smcTimeEstimationButton.setText(UPDATE_VERIFICATION_TIME_BTN_TEXT);
+                } else {
+                    int runsNeeded = (int) Math.ceil( (finalTimeWanted - stat_err) / coeff );
+                    float precision = settings.precisionFromRuns(runsNeeded);
+                    smcEstimationIntervalWidth.setText(precisionFormat.format(precision));
+                    smcTimeExpected.setText(String.valueOf(finalTimeWanted));
+                    smcTimeEstimationButton.setText(UPDATE_PRECISION_BTN_TEXT);
+                    updateSMCSettings();
+                }
+            };
+            
+            benchmarkThread = Verifier.runVerifyTAPNSilent(tapnNetwork, query, callback2, guiModels, false, lens);
+        };
+       
+        benchmarkThread = Verifier.runVerifyTAPNSilent(tapnNetwork, query, callback1, guiModels,false, lens);
+    }
+
+    private void updateFieldsOnBenchmark() {
+        smcConfidence.setEnabled(!doingBenchmark);
+        smcEstimationIntervalWidth.setEnabled(!doingBenchmark);
+        smcTimeExpected.setEnabled(!doingBenchmark);
+        smcParallel.setEnabled(!doingBenchmark);
+        smcVerificationType.setEnabled(!doingBenchmark);
+        smcStepBoundValue.setEnabled(!doingBenchmark && !smcStepBoundInfinite.isSelected());
+        smcStepBoundInfinite.setEnabled(!doingBenchmark && !smcTimeBoundInfinite.isSelected());
+        smcTimeBoundValue.setEnabled(!doingBenchmark && !smcTimeBoundInfinite.isSelected());
+        smcTimeBoundInfinite.setEnabled(!doingBenchmark && !smcStepBoundInfinite.isSelected());
+    }
+
 }
diff --git a/src/main/java/net/tapaal/gui/petrinet/dialog/QuerySlider.java b/src/main/java/net/tapaal/gui/petrinet/dialog/QuerySlider.java
new file mode 100644
index 000000000..563d20d16
--- /dev/null
+++ b/src/main/java/net/tapaal/gui/petrinet/dialog/QuerySlider.java
@@ -0,0 +1,49 @@
+package net.tapaal.gui.petrinet.dialog;
+
+import javax.swing.JSlider;
+import javax.swing.JTextField;
+
+public class QuerySlider extends JSlider {
+    private double realValue;
+    private double desiredMin;
+    private double desiredMax;
+
+    public QuerySlider(int value, double desiredMin, double desiredMax) {
+        this(value, desiredMin, desiredMax, 100);
+    }
+
+    public QuerySlider(int value, double desiredMin, double desiredMax, int resolution) {
+        super(0, resolution, value);
+        this.desiredMin = desiredMin;
+        this.desiredMax = desiredMax;
+    }
+
+    public void setRealValue(double realValue) {
+        this.realValue = realValue;
+    }
+
+    public double getRealValue() {
+        return realValue;
+    }
+
+    public double getDesiredMin() {
+        return desiredMin;
+    }
+
+    public double getDesiredMax() {
+        return desiredMax;
+    }
+
+    public void updateValue(JTextField textField, int precision) {
+        int value = getValue();
+        double desiredMin = getDesiredMin();
+        double desiredMax = getDesiredMax();
+        double proportion = (double) value / getMaximum();
+        double interpretedValue = desiredMin + proportion * (desiredMax - desiredMin);
+        double scale = Math.pow(10, precision);
+        double roundedValue = Math.round(interpretedValue * scale) / scale;
+        textField.setText(roundedValue + "");
+        setRealValue(roundedValue);
+        setToolTipText(String.format("Value: %." + precision + "f", roundedValue));
+    }
+}
diff --git a/src/main/java/net/tapaal/gui/petrinet/dialog/StatisticsPanel.java b/src/main/java/net/tapaal/gui/petrinet/dialog/StatisticsPanel.java
index a4be8e1b5..e453c17f2 100644
--- a/src/main/java/net/tapaal/gui/petrinet/dialog/StatisticsPanel.java
+++ b/src/main/java/net/tapaal/gui/petrinet/dialog/StatisticsPanel.java
@@ -118,7 +118,7 @@ private void addRow(Object[] row, int rowNumber, boolean isHeadLine){
 	private boolean checkIfOrphan(int contentNumber, GridBagConstraints gbc, boolean orphanTransitions) {
         boolean isOrphan = false;
         int rowNumber;
-
+        
         for (int i = 1; i < contents[contents.length - contentNumber].length; i++) {
             if (!contents[contents.length - contentNumber][i].toString().equals("0")) {
                 isOrphan = true;
diff --git a/src/main/java/net/tapaal/gui/petrinet/editor/ConstantsPane.java b/src/main/java/net/tapaal/gui/petrinet/editor/ConstantsPane.java
index cda6a518c..acbddc047 100644
--- a/src/main/java/net/tapaal/gui/petrinet/editor/ConstantsPane.java
+++ b/src/main/java/net/tapaal/gui/petrinet/editor/ConstantsPane.java
@@ -61,12 +61,15 @@ public class ConstantsPane extends JPanel implements SidePane {
 
     private static final String titleBorder = "Global constants, Color types and Variables";
     private static final String titleBorderNoColor = "Global constants";
+    private static final String titleBorderSMC = "Global constants and SMC Settings";
     private static final String titleBorderToolTip = "<html>Declaration of colors types, color variables and global integer constants.<br>To see a summary list press SHIFT + F</html>";
     private static final String titleBorderToolTipNoColor = "Declaration of global constants that can be used in intervals and age invariants";
+    private static final String titleBorderToolTipSmc = "Declaration of global constants that can be used in intervals and age invariants, and editing of SMC engine settings";
 
     private static final String CONSTANTS = "Constants";
     private static final String COLORTYPES = "Color type";
     private static final String VARIABLES = "Variables";
+    private static final String SMC_SETTINGS = "SMC Settings";
     private final JComboBox<String> constantsColorTypesVariablesComboBox = new JComboBox<>(new String[]{COLORTYPES, VARIABLES, CONSTANTS});
 
 
diff --git a/src/main/java/net/tapaal/gui/petrinet/editor/DistributionPanel.java b/src/main/java/net/tapaal/gui/petrinet/editor/DistributionPanel.java
new file mode 100644
index 000000000..022fc664d
--- /dev/null
+++ b/src/main/java/net/tapaal/gui/petrinet/editor/DistributionPanel.java
@@ -0,0 +1,517 @@
+package net.tapaal.gui.petrinet.editor;
+
+import dk.aau.cs.model.tapn.*;
+import dk.aau.cs.util.Require;
+import dk.aau.cs.util.RequireException;
+import net.tapaal.swinghelpers.GridBagHelper;
+import net.tapaal.swinghelpers.SwingHelper;
+import pipe.gui.TAPAALGUI;
+import pipe.gui.graph.Graph;
+import pipe.gui.graph.GraphDialog;
+import pipe.gui.graph.GraphPoint;
+import pipe.gui.graph.GraphDialog.GraphDialogBuilder;
+import pipe.gui.petrinet.graphicElements.tapn.TimedTransitionComponent;
+import pipe.gui.swingcomponents.EscapableDialog;
+
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.*;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DistributionPanel extends JPanel {
+
+    private TimedTransitionComponent transition;
+    private EscapableDialog dialog;
+
+    private static final String[] continuous =  { "constant", "uniform", "exponential", "normal", "gamma", "erlang" };
+    private static final String[] discrete =    { "discrete uniform", "geometric" };
+
+    public DistributionPanel(TimedTransitionComponent transition, EscapableDialog dialog) {
+        this.transition = transition;
+        this.dialog = dialog;
+        initComponents();
+        displayDistribution();
+    }
+
+    private void initComponents() {
+        useContinuousDistribution = new JRadioButton("Continuous");
+        useDiscreteDistribution = new JRadioButton("Discrete");
+        distributionCategoryGroup = new ButtonGroup();
+        distributionCategoryGroup.add(useContinuousDistribution);
+        distributionCategoryGroup.add(useDiscreteDistribution);
+        useContinuousDistribution.setSelected(true);
+
+        useContinuousDistribution.addActionListener(act -> {
+            distributionType.setModel(new DefaultComboBoxModel<>(continuous));
+            displayDistributionFields(SMCDistribution.defaultDistributionFor(String.valueOf(distributionType.getSelectedItem())));
+
+        });
+        useDiscreteDistribution.addActionListener(act -> {
+            distributionType.setModel(new DefaultComboBoxModel<>(discrete));
+            displayDistributionFields(SMCDistribution.defaultDistributionFor(String.valueOf(distributionType.getSelectedItem())));
+        });
+
+        distributionType = new JComboBox<>(continuous);
+        distributionShowGraph = new JButton("Show density");
+        distributionParam1Label = new JLabel();
+        distributionParam2Label = new JLabel();
+        distributionParam1Field = new JTextField(5);
+        distributionParam2Field = new JTextField(5);
+        meanLabel = new JLabel();
+        meanValueLabel = new JLabel();
+        SwingHelper.setPreferredWidth(distributionParam1Field, 100);
+        SwingHelper.setPreferredWidth(distributionParam2Field, 100);
+        distributionType.addActionListener(actionEvent -> {
+            if(!distributionType.hasFocus()) return;
+            displayDistributionFields(SMCDistribution.defaultDistributionFor(String.valueOf(distributionType.getSelectedItem())));
+        });
+        distributionShowGraph.addActionListener(actionEvent -> showDistributionGraph());
+        DocumentListener updateDistribDisplay = new DocumentListener() {
+            public void changedUpdate(DocumentEvent e) {
+                display();
+            }
+            public void removeUpdate(DocumentEvent e) {
+                display();
+            }
+            public void insertUpdate(DocumentEvent e) {
+                display();
+            }
+            public void display() {
+                SMCDistribution distrib = parseDistribution();
+                if (distrib.getMean() != null && !(distrib instanceof SMCNormalDistribution)) {
+                    meanLabel.setText("Mean :");
+                    meanValueLabel.setText(String.valueOf(distrib.getMean()));
+                } else {
+                    meanLabel.setText("");
+                    meanValueLabel.setText("");
+                }
+                distributionType.setToolTipText(distrib.explanation());
+            }
+        };
+        distributionParam1Field.getDocument().addDocumentListener(updateDistribDisplay);
+        distributionParam2Field.getDocument().addDocumentListener(updateDistribDisplay);
+
+        setLayout(new GridBagLayout());
+        setBorder(BorderFactory.createTitledBorder("Distribution and Firing Mode"));
+        GridBagConstraints gbc = GridBagHelper.as(0,0, GridBagHelper.Anchor.WEST, new Insets(3, 3, 3, 3));
+        add(useContinuousDistribution, gbc);
+        gbc.gridx++;
+        add(useDiscreteDistribution, gbc);
+        gbc.gridx++;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        add(distributionType, gbc);
+        gbc.fill = GridBagConstraints.NONE;
+        gbc.gridx++;
+        gbc.anchor = GridBagConstraints.EAST;
+
+        JPanel paramPanel = new JPanel(new GridBagLayout());
+        gbc = GridBagHelper.as(0,0, GridBagHelper.Anchor.WEST, new Insets(3, 3, 3, 3));
+        paramPanel.add(distributionParam1Label, gbc);
+        gbc.anchor = GridBagConstraints.WEST;
+        gbc.gridx++;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        paramPanel.add(distributionParam1Field, gbc);
+        gbc.fill = GridBagConstraints.BOTH;
+        gbc.gridx++;
+        gbc.anchor = GridBagConstraints.EAST;
+        paramPanel.add(distributionParam2Label, gbc);
+        gbc.anchor = GridBagConstraints.WEST;
+        gbc.gridx++;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        paramPanel.add(distributionParam2Field, gbc);
+        gbc.anchor = GridBagConstraints.EAST;
+        gbc.fill = GridBagConstraints.BOTH;
+        gbc.gridx++;
+        gbc.gridwidth = 1;
+        paramPanel.add(meanLabel, gbc);
+        gbc.gridx++;
+        gbc.anchor = GridBagConstraints.WEST;
+        paramPanel.add(meanValueLabel, gbc);
+        gbc = GridBagHelper.as(3 ,0, GridBagHelper.Anchor.WEST, new Insets(3, 3, 3, 3));
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        paramPanel.setPreferredSize(new Dimension(350, paramPanel.getPreferredSize().height));
+        add(paramPanel, gbc);
+
+        gbc.fill = GridBagConstraints.NONE;
+        gbc.gridx++;
+        gbc.anchor = GridBagConstraints.EAST;
+        add(distributionShowGraph, gbc);
+    }
+
+    public SMCDistribution parseDistribution() {
+        if(transition.isUrgent()) {
+            return SMCDistribution.urgent();
+        }
+        String type = String.valueOf(distributionType.getSelectedItem());
+        try {
+            switch (type) {
+                case SMCConstantDistribution.NAME:
+                    double value = Double.parseDouble(distributionParam1Field.getText());
+                    return new SMCConstantDistribution(value);
+                case SMCUniformDistribution.NAME:
+                    double a = Double.parseDouble(distributionParam1Field.getText());
+                    double b = Double.parseDouble(distributionParam2Field.getText());
+                    return new SMCUniformDistribution(a, b);
+                case SMCExponentialDistribution.NAME:
+                    double rate = Double.parseDouble(distributionParam1Field.getText());
+                    return new SMCExponentialDistribution(rate);
+                case SMCNormalDistribution.NAME:
+                    double mean = Double.parseDouble(distributionParam1Field.getText());
+                    double stddev = Double.parseDouble(distributionParam2Field.getText());
+                    return new SMCNormalDistribution(mean, stddev);
+                case SMCGammaDistribution.NAME:
+                    double shape = Double.parseDouble(distributionParam1Field.getText());
+                    double scale = Double.parseDouble(distributionParam2Field.getText());
+                    return new SMCGammaDistribution(shape, scale);
+                case SMCErlangDistribution.NAME:
+                    double eshape = Integer.parseInt(distributionParam1Field.getText());
+                    double escale = Double.parseDouble(distributionParam2Field.getText());
+                    return new SMCErlangDistribution(eshape, escale);
+                case SMCDiscreteUniformDistribution.NAME:
+                    double da = Integer.parseInt(distributionParam1Field.getText());
+                    double db = Integer.parseInt(distributionParam2Field.getText());
+                    return new SMCDiscreteUniformDistribution(da, db);
+                case SMCGeometricDistribution.NAME:
+                    double p = Double.parseDouble(distributionParam1Field.getText());
+                    return new SMCGeometricDistribution(p);
+            }
+        } catch(NumberFormatException ignored) {}
+        return SMCDistribution.defaultDistributionFor(type);
+    }
+
+    public void displayDistribution() {
+        SMCDistribution distribution = transition.underlyingTransition().getDistribution();
+        displayDistributionFields(distribution);
+    }
+
+    public void displayDistributionFields(SMCDistribution distribution) {
+        if(Arrays.asList(continuous).contains(distribution.distributionName())) {
+            useContinuousDistribution.setSelected(true);
+        } else {
+            useDiscreteDistribution.setSelected(true);
+        }
+        switch (distribution.distributionName()) {
+            case SMCConstantDistribution.NAME:
+                displayOneVariable("Value", ((SMCConstantDistribution) distribution).value);
+                break;
+            case SMCUniformDistribution.NAME:
+                displayTwoVariables(
+                    "A", ((SMCUniformDistribution) distribution).a,
+                    "B", ((SMCUniformDistribution) distribution).b);
+                break;
+            case SMCExponentialDistribution.NAME:
+                displayOneVariable("Rate", ((SMCExponentialDistribution) distribution).rate);
+                break;
+            case SMCNormalDistribution.NAME:
+                displayTwoVariables(
+                    "Mean", ((SMCNormalDistribution) distribution).mean,
+                    "Std. Dev", ((SMCNormalDistribution) distribution).stddev);
+                break;
+            case SMCGammaDistribution.NAME:
+                displayTwoVariables(
+                    "Shape", ((SMCGammaDistribution) distribution).shape,
+                    "Scale", ((SMCGammaDistribution) distribution).scale);
+                break;
+            case SMCErlangDistribution.NAME:
+                displayTwoVariables(
+                    "Shape", ((SMCErlangDistribution) distribution).shape,
+                    "Scale", ((SMCErlangDistribution) distribution).scale);
+                break;
+            case SMCDiscreteUniformDistribution.NAME:
+                displayTwoVariables(
+                    "A", ((SMCDiscreteUniformDistribution) distribution).a,
+                    "B", ((SMCDiscreteUniformDistribution) distribution).b);
+                break;
+            case SMCGeometricDistribution.NAME:
+                displayOneVariable("P", ((SMCGeometricDistribution) distribution).p);
+                break;
+            default:
+                break;
+        }
+        distributionType.setToolTipText(distribution.explanation());
+
+        if (distribution.getMean() != null && !(distribution instanceof SMCNormalDistribution)) {
+            meanLabel.setText("Mean :");
+            meanValueLabel.setText(String.valueOf(distribution.getMean()));
+        } else {
+            meanLabel.setText("");
+            meanValueLabel.setText("");
+        }
+
+        distributionType.setFocusable(false);
+        distributionType.setSelectedItem(distribution.distributionName());
+        distributionType.setFocusable(true);
+        dialog.pack();
+    }
+
+    private void displayOneVariable(String name, double value) {
+        distributionParam1Label.setText(name + " :");
+        distributionParam1Field.setText(String.valueOf(value));
+        distributionParam2Label.setVisible(false);
+        distributionParam2Field.setVisible(false);
+    }
+
+    private void displayTwoVariables(String name1, double value1, String name2, double value2) {
+        distributionParam1Label.setText(name1 + " :");
+        distributionParam2Label.setText(name2 + " :");
+        distributionParam1Field.setText(String.valueOf(value1));
+        distributionParam2Field.setText(String.valueOf(value2));
+        distributionParam2Label.setVisible(true);
+        distributionParam2Field.setVisible(true);
+    }
+
+    private void showDistributionGraph() {
+        SMCDistribution distribution = parseDistribution();
+
+        try {
+            GraphDialog dialog = createGraphDialog(distribution);
+            dialog.display();
+        } catch (RequireException e) {
+            JOptionPane.showMessageDialog(TAPAALGUI.getApp(), "There was an error opening the graph. Reason: " + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+    }
+
+    private GraphDialog createGraphDialog(SMCDistribution distribution) {
+        String title = "Probability Density Function";
+        GraphDialogBuilder builder = new GraphDialogBuilder();
+
+        if (distribution instanceof SMCConstantDistribution) {
+            Graph graph = createGraph((SMCConstantDistribution) distribution);
+            builder = builder.addGraph(graph).setTitle(title);
+        } else if (distribution instanceof SMCDiscreteUniformDistribution) {
+            Graph graph = createGraph((SMCDiscreteUniformDistribution) distribution);
+            builder = builder.addGraph(graph).setPointPlot(true);
+        } else if (distribution instanceof SMCExponentialDistribution) {
+            Graph graph = createGraph((SMCExponentialDistribution) distribution);
+            builder = builder.addGraph(graph);
+        } else if (distribution instanceof SMCGammaDistribution) {
+            Graph graph = createGraph((SMCGammaDistribution) distribution);
+            builder = builder.addGraph(graph);
+        } else if (distribution instanceof SMCErlangDistribution) {
+            Graph graph = createGraph((SMCErlangDistribution) distribution);
+            builder = builder.addGraph(graph);
+        } else if (distribution instanceof SMCNormalDistribution) {
+            Graph graph = createGraph((SMCNormalDistribution) distribution);
+            builder = builder.addGraph(graph).setTitle(title);
+        } else if (distribution instanceof SMCUniformDistribution) {
+            List<Graph> graphs = createGraphs((SMCUniformDistribution) distribution);
+            builder = builder.addGraphs(graphs).setPiecewise(true);
+        } else if (distribution instanceof SMCGeometricDistribution) {
+            Graph graph = createGraph((SMCGeometricDistribution) distribution);
+            builder = builder.addGraph(graph).setPointPlot(true);
+        }
+
+        return builder.setTitle(title).build();
+    }
+
+    private Graph createGraph(SMCConstantDistribution distribution) {
+        List<GraphPoint> points = new ArrayList<>();
+        LinkedHashMap<String, Double> params = distribution.getParameters();
+        double value = params.get("value");
+
+        points.add(new GraphPoint(value, 0));
+        points.add(new GraphPoint(value, 100));
+
+        return new Graph("Constant Distribution", points, distribution.getMean());
+    }
+
+    private Graph createGraph(SMCDiscreteUniformDistribution distribution) {
+        List<GraphPoint> points = new ArrayList<>();
+
+        LinkedHashMap<String, Double> params = distribution.getParameters();
+        double a = params.get("a");
+        double b = params.get("b");
+        double mean = distribution.getMean();
+
+        double n = b - a + 1;
+
+        for (int x = (int) a; x <= (int) b; ++x) {
+            points.add(new GraphPoint(x, 1 / n));
+        }
+
+        return new Graph("Discrete Uniform Distribution", points, mean);
+    }
+
+    private Graph createGraph(SMCExponentialDistribution distribution) {
+        List<GraphPoint> points = new ArrayList<>();
+
+        LinkedHashMap<String, Double> params = distribution.getParameters();
+        double rate = params.get("rate");
+        double mean = distribution.getMean();
+
+        int x = 0;
+        while (true) {
+            double y = rate * Math.exp(-rate * x);
+            if (y < 1e-6) break;
+            points.add(new GraphPoint(x, y));
+            ++x;
+        }
+
+        return new Graph("Exponential Distribution", points, mean);
+    }
+
+    private Graph createGraph(SMCGammaDistribution distribution) {
+        List<GraphPoint> points = new ArrayList<>();
+
+        LinkedHashMap<String, Double> params = distribution.getParameters();
+        double shape = params.get("shape");
+        double scale = params.get("scale");
+
+        Require.that(shape > 0, "Shape must be a positive real");
+
+        double gamma = spougeGammaApprox(shape - 1);
+        double coefficient = 1 / (gamma * Math.pow(scale, shape));
+        double step = 0.1;
+
+        // Start at some arbitrary small value to avoid division by zero
+        double x = 1e-6;
+        while (true) {
+            double y = coefficient * Math.pow(x, shape - 1) * Math.exp(-(x / scale));
+            if (y < 1e-6 && x > 1) break;
+            points.add(new GraphPoint(x, y));
+            x += step;	
+        }
+
+        return new Graph("Gamma Distribution", points, distribution.getMean());
+    }
+
+    private Graph createGraph(SMCErlangDistribution distribution) {
+        List<GraphPoint> points = new ArrayList<>();
+
+        LinkedHashMap<String, Double> params = distribution.getParameters();
+        double shape = params.get("shape");
+        double scale = params.get("scale");
+
+        Require.that(shape >= 1 && (shape % 1 == 0), "Shape must be a positive integer");
+
+
+        double gamma = spougeGammaApprox(shape - 1);
+        double coefficient = 1 / (gamma * Math.pow(scale, shape));
+        double step = 0.1;
+
+        // Start at some arbitrary small value to avoid division by zero
+        double x = 1e-6;
+        while (true) {
+            double y = coefficient * Math.pow(x, shape - 1) * Math.exp(-(x / scale));
+            if (y < 1e-6) break;
+            points.add(new GraphPoint(x, y));
+            x += step;
+        }
+
+        return new Graph("Erlang Distribution", points, distribution.getMean());
+    }
+
+    private double spougeGammaApprox(double shape) {
+        int a = 10;
+        List<Double> c = new ArrayList<>();
+        c.add(Math.sqrt(2 * Math.PI));
+        for (int k = 1; k < a; ++k) {
+            c.add((Math.pow(-1, k - 1) / factorial(k - 1)) * Math.pow(-k + a, k - 0.5) * Math.exp(-k + a));
+        }
+
+        double sum = c.get(0);
+        for (int k = 1; k < a; ++k) {
+            sum += c.get(k) / (shape + k);
+        }
+
+        double term = Math.pow(shape + a, shape + 0.5) * Math.exp(-shape - a);
+        return term * sum;
+    }
+
+    private int factorial(int n) {
+        int result = 1;
+        if (n == 0) return result;
+
+        for (int i = 1; i <= n; ++i) {
+            result *= i;
+        }
+
+        return result;
+    }
+
+    private Graph createGraph(SMCNormalDistribution distribution) {
+        List<GraphPoint> points = new ArrayList<>();
+
+        LinkedHashMap<String, Double> params = distribution.getParameters();
+        double mean = distribution.getMean();
+        double stddev = params.get("stddev");
+        double variance = Math.pow(stddev, 2);
+        
+        double coefficient = 1 / Math.sqrt(2 * Math.PI * variance);
+        double step = 0.1 * stddev;
+        double twoVariance = 2 * variance;
+        double negInvTwoVariance = -1 / twoVariance;
+    
+        double min = Math.max(mean - 3 * stddev, 0);
+        double max = mean + 3 * stddev;
+
+        for (double x = min; x <= max; x += step) {
+            double exponent = Math.pow(x - mean, 2) * negInvTwoVariance;
+            double y = coefficient * Math.exp(exponent);
+            points.add(new GraphPoint(x, y));
+        }
+
+        return new Graph("Normal Distribution", points, mean);
+    }
+
+    private List<Graph> createGraphs(SMCUniformDistribution distribution) {
+        List<Graph> graphs = new ArrayList<>(); 
+        
+        List<GraphPoint> pointsG1 = new ArrayList<>();
+        List<GraphPoint> pointsG2 = new ArrayList<>();
+        List<GraphPoint> pointsG3 = new ArrayList<>();  
+
+        LinkedHashMap<String, Double> params = distribution.getParameters();
+        double a = params.get("a");
+        double b = params.get("b");
+        double mean = distribution.getMean();
+
+        pointsG1.add(new GraphPoint(0, 0));
+        pointsG1.add(new GraphPoint(a, 0));
+        pointsG2.add(new GraphPoint(a, 1/(b-a)));
+        pointsG2.add(new GraphPoint(b, 1/(b-a)));
+        pointsG3.add(new GraphPoint(b, 0));
+        pointsG3.add(new GraphPoint(b + a, 0));
+
+        graphs.add(new Graph("Uniform Distribution", pointsG1, mean));
+        graphs.add(new Graph("piece2", pointsG2));
+        graphs.add(new Graph("piece3", pointsG3));
+
+        return graphs;
+    }
+
+    private Graph createGraph(SMCGeometricDistribution distribution) {
+        List<GraphPoint> points = new ArrayList<>();
+
+        LinkedHashMap<String, Double> params = distribution.getParameters();
+        double p = params.get("p");
+
+        double y = p;
+        int x = 0;
+
+        while(y > 0.01 && x < 100) {
+            points.add(new GraphPoint(x, y));
+            y *= (1 - p);
+            x++;
+        }
+
+        return new Graph("Geometric distribution", points, distribution.getMean());
+    }
+
+    private JRadioButton useContinuousDistribution;
+    private JRadioButton useDiscreteDistribution;
+    private ButtonGroup distributionCategoryGroup;
+    private JComboBox<String> distributionType;
+    private JButton distributionShowGraph;
+    private JLabel distributionParam1Label;
+    private JLabel distributionParam2Label;
+    private JTextField distributionParam1Field;
+    private JTextField distributionParam2Field;
+    private JLabel meanLabel;
+    private JLabel meanValueLabel;
+}
diff --git a/src/main/java/net/tapaal/gui/petrinet/undo/ChangeFiringModeCommand.java b/src/main/java/net/tapaal/gui/petrinet/undo/ChangeFiringModeCommand.java
new file mode 100644
index 000000000..79ccd7bac
--- /dev/null
+++ b/src/main/java/net/tapaal/gui/petrinet/undo/ChangeFiringModeCommand.java
@@ -0,0 +1,26 @@
+package net.tapaal.gui.petrinet.undo;
+
+import dk.aau.cs.model.tapn.TimedTransition;
+import dk.aau.cs.model.tapn.simulation.FiringMode;
+
+public class ChangeFiringModeCommand implements Command {
+    private final TimedTransition transition;
+    private final FiringMode oldFiringMode;
+    private final FiringMode newFiringMode;
+
+    public ChangeFiringModeCommand(TimedTransition transition, FiringMode newFiringMode) {
+        this.transition = transition;
+        this.oldFiringMode = transition.getFiringMode();
+        this.newFiringMode = newFiringMode;
+    }
+
+    @Override
+    public void redo() {
+        transition.setFiringMode(newFiringMode);
+    }
+
+    @Override
+    public void undo() {
+        transition.setFiringMode(oldFiringMode);
+    }
+}
diff --git a/src/main/java/net/tapaal/gui/petrinet/undo/ChangeProbabilityWeightCommand.java b/src/main/java/net/tapaal/gui/petrinet/undo/ChangeProbabilityWeightCommand.java
new file mode 100644
index 000000000..989d6dc7c
--- /dev/null
+++ b/src/main/java/net/tapaal/gui/petrinet/undo/ChangeProbabilityWeightCommand.java
@@ -0,0 +1,31 @@
+package net.tapaal.gui.petrinet.undo;
+
+import dk.aau.cs.model.tapn.Probability;
+import dk.aau.cs.model.tapn.TimedTransition;
+import pipe.gui.petrinet.graphicElements.tapn.TimedTransitionComponent;
+
+public class ChangeProbabilityWeightCommand implements Command {
+    private final TimedTransitionComponent transitionComponent;
+    private final TimedTransition transition;
+    private final Probability oldValue;
+    private final Probability newValue;
+    
+    public ChangeProbabilityWeightCommand(TimedTransitionComponent transitionComponent, TimedTransition transition, Probability newWeight) {
+        this.transitionComponent = transitionComponent;
+        this.transition = transition;
+        this.oldValue = transition.getWeight();
+        this.newValue = newWeight;
+    }
+
+    @Override
+    public void redo() {
+        transition.setWeight(newValue);
+        transitionComponent.update(true);
+    }
+
+    @Override
+    public void undo() {
+        transition.setWeight(oldValue);
+        transitionComponent.update(true);
+    }
+}
diff --git a/src/main/java/net/tapaal/gui/petrinet/undo/ChangeTransitionDistributionCommand.java b/src/main/java/net/tapaal/gui/petrinet/undo/ChangeTransitionDistributionCommand.java
new file mode 100644
index 000000000..35370ce2b
--- /dev/null
+++ b/src/main/java/net/tapaal/gui/petrinet/undo/ChangeTransitionDistributionCommand.java
@@ -0,0 +1,33 @@
+package net.tapaal.gui.petrinet.undo;
+
+import dk.aau.cs.model.tapn.TimedTransition;
+import dk.aau.cs.model.tapn.SMCDistribution;
+import pipe.gui.petrinet.PetriNetTab;
+import pipe.gui.petrinet.graphicElements.tapn.TimedTransitionComponent;
+
+public class ChangeTransitionDistributionCommand implements Command {
+    private final TimedTransitionComponent transitionComponent;
+    private final TimedTransition transition;
+    private final SMCDistribution oldValue;
+    private final SMCDistribution newValue;
+
+    public ChangeTransitionDistributionCommand(TimedTransitionComponent transitionComponent, TimedTransition transition, SMCDistribution newDistribution) {
+        this.transitionComponent = transitionComponent;
+        this.transition = transition;
+        oldValue = transition.getDistribution();
+        newValue = newDistribution;
+    }
+
+    @Override
+    public void redo() {
+        transition.setDistribution(newValue);
+        transitionComponent.update(true);
+    }
+
+    @Override
+    public void undo() {
+        transition.setDistribution(oldValue);
+        transitionComponent.update(true);
+    }
+
+}
diff --git a/src/main/java/net/tapaal/gui/petrinet/undo/Colored/UpdateColorTypeCommand.java b/src/main/java/net/tapaal/gui/petrinet/undo/Colored/UpdateColorTypeCommand.java
index 629e1a97f..b7e09d222 100644
--- a/src/main/java/net/tapaal/gui/petrinet/undo/Colored/UpdateColorTypeCommand.java
+++ b/src/main/java/net/tapaal/gui/petrinet/undo/Colored/UpdateColorTypeCommand.java
@@ -73,8 +73,9 @@ public void redo() {
             for (TimedPlace place : tapn.places()) {
                 if (place.getColorType().equals(oldColorType)) {
 
-                    if(place.getTokensAsExpression() != null)
+                    if(place.getTokensAsExpression() != null) {
                         place.setTokenExpression(place.getTokensAsExpression().getExprConverted(oldColorType, newColorType));
+                    }
 
                     List<TimedToken> oldTokens = new ArrayList<>(place.tokens());
                     place.setColorType(newColorType);
diff --git a/src/main/java/net/tapaal/gui/petrinet/undo/Command.java b/src/main/java/net/tapaal/gui/petrinet/undo/Command.java
index ce16aab01..00b6d6552 100644
--- a/src/main/java/net/tapaal/gui/petrinet/undo/Command.java
+++ b/src/main/java/net/tapaal/gui/petrinet/undo/Command.java
@@ -2,5 +2,5 @@
 
 public interface Command {
 	void undo();
-	void redo();
+  void redo();
 }
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/EngineSupportOptions.java b/src/main/java/net/tapaal/gui/petrinet/verification/EngineSupportOptions.java
index 87f7a939d..94fb14dfd 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/EngineSupportOptions.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/EngineSupportOptions.java
@@ -1,47 +1,21 @@
 package net.tapaal.gui.petrinet.verification;
 
 public class EngineSupportOptions {
-    public final String nameString;
-    public final boolean supportFastestTrace;
-    public final boolean supportDeadlockNetdegree2EForAG;
-    public final boolean supportDeadlockWithInhib;
-    public final boolean supportWeights;
-    public final boolean supportInhibArcs;
-    public final boolean supportUrgentTransitions;
-    public final boolean supportEGorAF;
-    public final boolean supportStrictNets;
-    public final boolean supportTimedNets;
-    public final boolean supportDeadlockNetdegreeGreaterThan2;
-    public final boolean supportGames;
-    public final boolean supportEGorAFWithNetDegreeGreaterThan2;
-    public final boolean supportNestedQuantifications;
-    public final boolean supportColored;
-    public final boolean supportOnlyUntimed;
+    private final boolean[] optionsArray;
+    private final String nameString;
 
-    public final boolean[] optionsArray;
     public EngineSupportOptions(String nameString, boolean supportFastestTrace, boolean supportDeadlockNetdegree2EForAG, boolean supportDeadlockEGorAF, boolean supportDeadlockWithInhib,
                                 boolean supportWeights, boolean supportInhibArcs, boolean supportUrgentTransitions, boolean supportEGorAF, boolean supportStrictNets, boolean supportTimedNets,
                                 boolean supportDeadlockNetdegreeGreaterThan2, boolean supportGames, boolean supportEGorAFWithNetDegreeGreaterThan2, boolean supportNestedQuantifications,
-                                boolean supportColored, boolean supportOnlyUntimed){
+                                boolean supportColored, boolean supportOnlyUntimed, boolean supportSmc){
         this.nameString = nameString;
-        this.supportFastestTrace = supportFastestTrace;
-        this.supportDeadlockNetdegree2EForAG = supportDeadlockNetdegree2EForAG;
-        this.supportDeadlockWithInhib = supportDeadlockWithInhib;
-        this.supportWeights = supportWeights;
-        this.supportInhibArcs = supportInhibArcs;
-        this.supportUrgentTransitions = supportUrgentTransitions;
-        this.supportEGorAF = supportEGorAF;
-        this.supportStrictNets = supportStrictNets;
-        this.supportTimedNets = supportTimedNets;
-        this.supportDeadlockNetdegreeGreaterThan2 = supportDeadlockNetdegreeGreaterThan2;
-        this.supportGames = supportGames;
-        this.supportEGorAFWithNetDegreeGreaterThan2 = supportEGorAFWithNetDegreeGreaterThan2;
-        this.supportNestedQuantifications = supportNestedQuantifications;
-        this.supportColored = supportColored;
-        this.supportOnlyUntimed = supportOnlyUntimed;
         this.optionsArray = new boolean[]{supportFastestTrace, supportDeadlockNetdegree2EForAG, supportDeadlockEGorAF, supportDeadlockWithInhib,
             supportWeights, supportInhibArcs, supportUrgentTransitions, supportEGorAF, supportStrictNets, supportTimedNets, supportDeadlockNetdegreeGreaterThan2,
-            supportGames, supportEGorAFWithNetDegreeGreaterThan2, supportNestedQuantifications, supportColored, supportOnlyUntimed};
+            supportGames, supportEGorAFWithNetDegreeGreaterThan2, supportNestedQuantifications, supportColored, supportOnlyUntimed, supportSmc};
+    }
+
+    public String getNameString() {
+        return nameString;
     }
 
     public boolean areOptionsSupported(boolean[] queryOptions){
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/KBoundAnalyzer.java b/src/main/java/net/tapaal/gui/petrinet/verification/KBoundAnalyzer.java
index 0ac038439..80cd65d34 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/KBoundAnalyzer.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/KBoundAnalyzer.java
@@ -90,8 +90,8 @@ protected VerifyTAPNOptions verificationOptions() {
 			return new VerifyTAPNOptions(k, TraceOption.NONE, SearchOption.BFS, true, false, true, false, false, 1, dataLayerQuery.getRawVerification(), dataLayerQuery.getRawVerificationPrompt());
 		} else if(modelChecker instanceof VerifyDTAPN){
             //gdc and dart can be used together with game
-            boolean gcd = !lens.isGame();
-            boolean dart = !tapnNetwork.hasUrgentTransitions() && !lens.isGame();
+            boolean gcd = !lens.isGame() && !lens.isStochastic();
+            boolean dart = !tapnNetwork.hasUrgentTransitions() && !lens.isGame() && !lens.isStochastic();
 
 			return new VerifyDTAPNOptions(true, k, TraceOption.NONE, SearchOption.BFS, true, gcd, dart, true, false, false, 1, false, true, true, tapnNetwork.isColored(), useRawVerification, rawVerificationPrompt);
 		}
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/RunVerification.java b/src/main/java/net/tapaal/gui/petrinet/verification/RunVerification.java
index 00be347d4..38b99380e 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/RunVerification.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/RunVerification.java
@@ -7,22 +7,17 @@
 import dk.aau.cs.TCTL.TCTLEGNode;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
 import dk.aau.cs.model.tapn.simulation.TAPNNetworkTrace;
-import dk.aau.cs.TCTL.*;
-import dk.aau.cs.io.LoadedModel;
-import dk.aau.cs.io.PNMLoader;
-import dk.aau.cs.model.tapn.TimedArcPetriNet;
-import dk.aau.cs.model.tapn.simulation.TAPNNetworkTrace;
-import dk.aau.cs.model.tapn.simulation.TimedArcPetriNetTrace;
-import dk.aau.cs.util.FormatException;
 import dk.aau.cs.util.MemoryMonitor;
 import dk.aau.cs.util.Tuple;
 import dk.aau.cs.util.VerificationCallback;
 import dk.aau.cs.verification.*;
 import dk.aau.cs.verification.VerifyTAPN.ColorBindingParser;
-import net.tapaal.gui.petrinet.TAPNLens;
 import net.tapaal.swinghelpers.GridBagHelper;
-import pipe.gui.MessengerImpl;
 import pipe.gui.TAPAALGUI;
+import pipe.gui.graph.Graph;
+import pipe.gui.graph.GraphDialog;
+import pipe.gui.graph.GraphPoint;
+import pipe.gui.graph.GraphDialog.GraphDialogBuilder;
 import pipe.gui.petrinet.PetriNetTab;
 import pipe.gui.petrinet.dataLayer.DataLayer;
 
@@ -34,8 +29,11 @@
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 import java.io.File;
-import java.util.*;
 import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Comparator;
 
 import static java.util.Objects.nonNull;
 import static net.tapaal.swinghelpers.GridBagHelper.Anchor.WEST;
@@ -83,7 +81,7 @@ protected boolean showResult(VerificationResult<TAPNNetworkTrace> result) {
 						iconSelector.getIconFor(result)
 				);
 
-                if (options.traceOption() != TAPNQuery.TraceOption.NONE) {
+                if (options.traceOption() != TAPNQuery.TraceOption.NONE || lens.isStochastic() && options.isSimulate()) {
                     if (!reducedNetOpened && nonNull(result.getTrace()) && nonNull(TAPAALGUI.getAnimator())) {
                         if ((lens != null && lens.isColored()) || model.isColored()) {
                             int dialogResult = JOptionPane.showConfirmDialog(null, "There is a trace that will be displayed in a new tab on the unfolded net/query.", "Open trace", JOptionPane.OK_CANCEL_OPTION);
@@ -93,6 +91,8 @@ protected boolean showResult(VerificationResult<TAPNNetworkTrace> result) {
                         }
                         if (result.getTraceMap() == null) {
                             TAPAALGUI.getAnimator().setTrace(result.getTrace());
+                        } else if (lens.isStochastic() && options.isSimulate()) {
+                            TAPAALGUI.getAnimator().setTrace(result.getTrace(), result.getTraceMap());
                         } else {
                             Map<String, TAPNNetworkTrace> traceMap = new HashMap<>();
                             for (String key : result.getTraceMap().keySet()) {
@@ -130,7 +130,6 @@ protected boolean showResult(VerificationResult<TAPNNetworkTrace> result) {
 			//version GLIB_2.0 not defined in file libc.so.6 with
 			//link time reference
 			//is the error as this (often) means the possibility for a uppaal licence key error
-
             if (((lens != null && lens.isColored()) || model.isColored())) {
                 if (result != null && result.errorMessage().contains("Only weight=1")) {
                     String[] split1 = result.errorMessage().split("between ", 2);
@@ -184,9 +183,10 @@ private int displayStats(JPanel panel, String stats, String[] explanations, int
         String[] statsStrings = stats.split(System.getProperty("line.separator"));
 
         for (int i = 0; i < statsStrings.length; i++) {
-            GridBagConstraints gbc = GridBagHelper.as(0, i+startOffset, WEST, new Insets(0,0,0,0));
+            GridBagConstraints gbc = GridBagHelper.as(i / 4, (i%4)+startOffset, WEST, new Insets(0, i >= 4 ? 10 : 0,0,0));
             JLabel statLabel = new JLabel(statsStrings[i]);
-            statLabel.setToolTipText(explanations[i]);
+            if(explanations.length > i)
+                statLabel.setToolTipText(explanations[i]);
             panel.add(statLabel, gbc);
         }
         return startOffset+statsStrings.length;
@@ -350,6 +350,10 @@ private Object[][] extractArrayFromPlaceBoundStatistics(final VerificationResult
 	private JPanel createMessagePanel(final VerificationResult<TAPNNetworkTrace> result) {
 		final JPanel panel = new JPanel(new GridBagLayout());
 
+        if(result.getQueryResult().isSMC()) {
+            return new SMCResultPanel(result);
+        }
+
 		GridBagConstraints gbc = new GridBagConstraints();
 		gbc.gridx = 0;
 		gbc.gridy = 0;
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/RunVerificationBase.java b/src/main/java/net/tapaal/gui/petrinet/verification/RunVerificationBase.java
index ada95c432..98b25dbba 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/RunVerificationBase.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/RunVerificationBase.java
@@ -88,12 +88,13 @@ protected VerificationResult<TAPNNetworkTrace> doInBackground() throws Exception
             underaprx.modifyTAPN(transformedModel.value1(), options.approximationDenominator());
         }
 
-        clonedQuery = new TAPNQuery(query.getProperty().copy(), query.getExtraTokens());
+        clonedQuery = new TAPNQuery(query.getProperty().copy(), query.getExtraTokens(), query.getSMCSettings());
         MapQueryToNewNames(clonedQuery, transformedModel.value2());
 
         if (dataLayerQuery != null) {
             clonedQuery.setCategory(dataLayerQuery.getCategory()); // Used by the CTL engine
             clonedQuery.setTraceList(dataLayerQuery.getTraceList());
+            clonedQuery.setSMCSettings(dataLayerQuery.getSmcSettings());
         }
 
         if (options.enabledStateequationsCheck()) {
@@ -242,7 +243,7 @@ protected void done() {
 				return;
 			}
 			firePropertyChange("state", StateValue.PENDING, StateValue.DONE);
-
+         
 			if (result == null) return;
 			if (showResult(result) && spinner != null) {
                 QueryReductionTime reductionTime = QueryReductionTime.UnlimitedTime;
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/TAPNQuery.java b/src/main/java/net/tapaal/gui/petrinet/verification/TAPNQuery.java
index ff13a134f..f03f59851 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/TAPNQuery.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/TAPNQuery.java
@@ -3,6 +3,8 @@
 import dk.aau.cs.TCTL.*;
 import dk.aau.cs.translations.ReductionOption;
 import dk.aau.cs.verification.QueryType;
+import dk.aau.cs.verification.SMCSettings;
+import dk.aau.cs.verification.SMCTraceType;
 
 import java.util.ArrayList;
 
@@ -33,7 +35,7 @@ public enum WorkflowMode{
 	}
 	
 	public enum QueryCategory{
-		Default, CTL, LTL, HyperLTL
+		Default, CTL, LTL, HyperLTL, SMC
 	}
 	
 	public enum AlgorithmOption{
@@ -86,6 +88,53 @@ public enum AlgorithmOption{
 	private boolean useRawVerification = false;
 	private String rawVerificationPrompt;
 
+    private SMCSettings smcSettings;
+    private boolean benchmark = false;
+    private int benchmarkRuns = 100;
+    private boolean parallel = false;
+    
+    public enum VerificationType {
+        QUANTITATIVE, QUALITATIVE, SIMULATE;
+
+        public static VerificationType fromOrdinal(int ordinal) {
+            switch (ordinal) {
+                case 1:
+                    return QUALITATIVE;
+                case 2:
+                    return SIMULATE;
+                default:
+                    return QUANTITATIVE;
+            }
+        }
+
+        public static VerificationType fromString(String type) {
+            switch (type) {
+                case "Qualitative":
+                    return QUALITATIVE;
+                case "Simulate":
+                    return SIMULATE;
+                default:
+                    return QUANTITATIVE;
+            }
+        }
+
+        @Override
+        public String toString() {
+            switch (this) {
+                case QUALITATIVE:
+                    return "Qualitative";
+                case SIMULATE:
+                    return "Simulate";
+                default:
+                    return "Quantitative";
+            }
+        }
+    }
+
+    private VerificationType verificationType = VerificationType.QUANTITATIVE;
+    private int numberOfTraces = 1;
+    private SMCTraceType smcTraceType = new SMCTraceType();
+
 	/**
 	 * @param name
 	 *            the name to set
@@ -508,6 +557,14 @@ public void copyOptions(TAPNQuery query){
         setUseTarjan(query.isTarjan());
 		setRawVerification(query.getRawVerification());
 		setRawVerificationPrompt(query.getRawVerificationPrompt());
+        setSmcSettings(query.getSmcSettings());
+        setBenchmarkMode(isBenchmarkMode());
+        setBenchmarkRuns(getBenchmarkRuns());
+        setParallel(isParallel());
+    }
+
+    public void setProperty(TCTLAbstractProperty property) {
+        this.property = property;
     }
 
 	public InclusionPlaces inclusionPlaces() {
@@ -531,7 +588,10 @@ public TAPNQuery copy() {
 		copy.setUseQueryReduction(this.isQueryReductionEnabled());
 		copy.setUseStubbornReduction(this.isStubbornReductionEnabled());
 		copy.setUseTarOption(this.isTarOptionEnabled());
-		
+		copy.setSmcSettings(this.getSmcSettings());
+        copy.setBenchmarkMode(this.isBenchmarkMode());
+        copy.setBenchmarkRuns(this.getBenchmarkRuns());
+        copy.setParallel(this.isParallel());
 		return copy;
 	}
 	
@@ -539,6 +599,8 @@ public QueryType queryType(){
 		if(property instanceof TCTLEFNode) return QueryType.EF;
 		else if(property instanceof TCTLEGNode) return QueryType.EG;
 		else if(property instanceof TCTLAFNode) return QueryType.AF;
+        else if(queryCategory == QueryCategory.SMC && property instanceof LTLFNode) return QueryType.PF;
+        else if(queryCategory == QueryCategory.SMC && property instanceof LTLGNode) return QueryType.PG;
 		else return QueryType.AG;
 	}
 
@@ -574,8 +636,61 @@ public AlgorithmOption getAlgorithmOption(){
     	return this.algorithmOption;
     }
 
+    public SMCSettings getSmcSettings() { return this.smcSettings; }
+
+    public void setSmcSettings(SMCSettings newSettings) { this.smcSettings = newSettings; }
+
+    public boolean isBenchmarkMode() { return benchmark; }
+    public void setBenchmarkMode(boolean mode) {
+        benchmark = mode;
+    }
+
+    public int getBenchmarkRuns() { return benchmarkRuns; }
+    public void setBenchmarkRuns(int runs) {
+        benchmarkRuns = runs;
+    }
+
+    public boolean isParallel() { return parallel; }
+    public void setParallel(boolean value) {
+        parallel = value;
+    }
+
+    public void setVerificationType(VerificationType verificationType) {
+        this.verificationType = verificationType;
+    }
+
+    public VerificationType getVerificationType() {
+        return verificationType;
+    }
+
+    public void setNumberOfTraces(int numberOfTraces) {
+        this.numberOfTraces = numberOfTraces;
+    }
+
+    public int getNumberOfTraces() {
+        return numberOfTraces;
+    }
+
+    public void setSmcTraceType(SMCTraceType traceType) {
+        this.smcTraceType = traceType;
+    }
+
+    public SMCTraceType getSmcTraceType() {
+        return smcTraceType;
+    }
+
+    public boolean isSimulate() {
+        return verificationType == VerificationType.SIMULATE;
+    }
+
+
+
     public boolean hasUntimedOnlyProperties(){
-        if(!(property instanceof TCTLAFNode || property instanceof TCTLAGNode || property instanceof TCTLEFNode || property instanceof TCTLEGNode)){
+        if(!(
+                property instanceof TCTLAFNode || property instanceof TCTLAGNode ||
+                property instanceof TCTLEFNode || property instanceof TCTLEGNode ||
+                queryType() == QueryType.PF || queryType() == QueryType.PG
+        )){
             return true;
         } else if(property.hasNestedPathQuantifiers()){
             return true;
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALBroadcastDegree2Options.java b/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALBroadcastDegree2Options.java
index b04a2005d..3af8fc516 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALBroadcastDegree2Options.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALBroadcastDegree2Options.java
@@ -20,6 +20,7 @@ public UPPAALBroadcastDegree2Options() {
             true,//support EG or AF with net degree > 2);
             false, //support for nested quantification
             false,
+            false,
             false
         );
     }
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALBroadcastOptions.java b/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALBroadcastOptions.java
index d698d4b2d..0206f42b5 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALBroadcastOptions.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALBroadcastOptions.java
@@ -20,6 +20,7 @@ public UPPAALBroadcastOptions() {
             true, //support EG or AF with net degree > 2);
             false, //support for nested quantification
            false,
+           false,
            false
        );
     }
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALCombiOptions.java b/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALCombiOptions.java
index fbcc14c20..bec989969 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALCombiOptions.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALCombiOptions.java
@@ -20,6 +20,7 @@ public UPPAALCombiOptions() {
             true, //support EG or AF with net degree > 2);
             false, //support for nested quantification
             false,
+            false,
             false
         );
     }
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALOptimizedStandardOptions.java b/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALOptimizedStandardOptions.java
index b34bd3883..a11b98fe1 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALOptimizedStandardOptions.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALOptimizedStandardOptions.java
@@ -20,6 +20,7 @@ public UPPAALOptimizedStandardOptions() {
             false,//support EG or AF with net degree > 2);
             false, //support for nested quantification
             false,
+            false,
             false
         );
     }
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALStandardOptions.java b/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALStandardOptions.java
index 6c57cd7e6..e08b4c42e 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALStandardOptions.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/UPPAALStandardOptions.java
@@ -20,6 +20,7 @@ public UPPAALStandardOptions() {
             false, //support EG or AF with net degree > 2);
             false, //support for nested quantification,
             false,
+            false,
             false
         );
     }
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/UnfoldNet.java b/src/main/java/net/tapaal/gui/petrinet/verification/UnfoldNet.java
index e69f24f00..b456748b6 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/UnfoldNet.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/UnfoldNet.java
@@ -108,7 +108,7 @@ protected String doInBackground() throws Exception {
             }
             templates.add(new Template(transformedModel.value1(), composer.getGuiModel(), new Zoomer()));
             if(lens.isTimed()){
-                TimedArcPetriNetNetworkWriter writerTACPN = new TimedArcPetriNetNetworkWriter(network, templates, queries, model.constants());
+                TimedArcPetriNetNetworkWriter writerTACPN = new TimedArcPetriNetNetworkWriter(network, templates, queries, model.constants(), lens);
                 writerTACPN.savePNML(modelFile, false);
             } else{
                 var guiModels = new HashMap<TimedArcPetriNet, DataLayer>();
@@ -185,7 +185,7 @@ protected String doInBackground() throws Exception {
                 loadedModel = new PNMLoader().load(fileOut);
             }
             // addLocation(loadedModel, composer); // We can not get coords from server
-            newTab = new PetriNetTab(loadedModel.network(), loadedModel.templates(), loadedModel.queries(), new TAPNLens(oldTab.getLens().isTimed(), oldTab.getLens().isGame(), false));
+            newTab = new PetriNetTab(loadedModel.network(), loadedModel.templates(), loadedModel.queries(), new TAPNLens(oldTab.getLens().isTimed(), oldTab.getLens().isGame(), false, oldTab.getLens().isStochastic()));
             newTab.setInitialName(oldTab.getTabTitle().replace(".tapn", "") + "-unfolded");
 
             Thread thread = new Thread(() -> TAPAALGUI.getAppGuiController().openTab(newTab));
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/Verifier.java b/src/main/java/net/tapaal/gui/petrinet/verification/Verifier.java
index ffa738860..6653439ff 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/Verifier.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/Verifier.java
@@ -260,7 +260,7 @@ public static void runVerifyTAPNVerification(
             if (tapnNetwork.isColored() && query.getTraceOption() != TAPNQuery.TraceOption.NONE) {
                 SmartDrawDialog.setupWorkerListener(thread);
             }
-            thread.execute(verifytapnOptions, tapnNetwork, new dk.aau.cs.model.tapn.TAPNQuery(query.getProperty(), query.getCapacity()), query, lens);
+            thread.execute(verifytapnOptions, tapnNetwork, new dk.aau.cs.model.tapn.TAPNQuery(query.getProperty(), query.getCapacity(), query.getSmcSettings()), query, lens);
             dialog.setVisible(true);
         } else {
             JOptionPane.showMessageDialog(TAPAALGUI.getApp(),
@@ -295,7 +295,14 @@ public static VerifyTAPNOptions getVerificationOptions(TAPNQuery query, boolean
                 query.useColorFixpoint(),
                 isColored,// Unfold net
                 query.getRawVerification(),
-                query.getRawVerificationPrompt()
+                query.getRawVerificationPrompt(),
+                query.isBenchmarkMode(),
+                query.getBenchmarkRuns(),
+                query.isParallel(),
+                query.getCategory(),
+                query.getNumberOfTraces(),
+                query.getSmcTraceType(),
+                query.isSimulate()
         );
         } else if (query.getReductionOption() == ReductionOption.VerifyPN) {
             return new VerifyPNOptions(
@@ -354,4 +361,55 @@ public static void createTempFile() {
             return;
         }
     }
+
+    public static RunVerificationBase runVerifyTAPNSilent(
+        TimedArcPetriNetNetwork tapnNetwork,
+        TAPNQuery query,
+        VerificationCallback callback,
+        HashMap<TimedArcPetriNet, DataLayer> guiModels,
+        boolean onlyCreateReducedNet,
+        TAPNLens lens) {
+        query = convertQuery(query, lens);
+        ModelChecker verifytapn = getModelChecker(query);
+
+        if (reducedNetTempFile == null) createTempFile();
+
+        if (!verifytapn.isCorrectVersion()) {
+            new MessengerImpl().displayErrorMessage(
+                "No " + verifytapn + " specified: The verification is cancelled",
+                "Verification Error");
+            return null;
+        }
+
+        TCTLAbstractProperty inputQuery = query.getProperty();
+
+        boolean isColored = (lens != null && lens.isColored() || tapnNetwork.isColored());
+        VerifyTAPNOptions verifytapnOptions = getVerificationOptions(query, isColored);
+
+        if (inputQuery == null) {
+            return null;
+        }
+
+        if (tapnNetwork != null) {
+            RunVerificationBase thread;
+            if (reducedNetTempFile != null) {
+                thread = new RunVerification(verifytapn, new VerifyTAPNIconSelector(), new MessengerImpl(), callback, guiModels, getReducedNetFilePath(), onlyCreateReducedNet);
+            } else {
+                thread = new RunVerification(verifytapn, new VerifyTAPNIconSelector(), new MessengerImpl(), callback, guiModels);
+            }
+
+            if (tapnNetwork.isColored() && query.getTraceOption() != TAPNQuery.TraceOption.NONE) {
+                SmartDrawDialog.setupWorkerListener(thread);
+            }
+            thread.execute(verifytapnOptions, tapnNetwork, new dk.aau.cs.model.tapn.TAPNQuery(query.getProperty(), query.getCapacity(), query.getSmcSettings()), query, lens);
+            return thread;
+        } else {
+            JOptionPane.showMessageDialog(TAPAALGUI.getApp(),
+                "There was an error converting the model.",
+                "Conversion error", JOptionPane.ERROR_MESSAGE);
+        }
+
+        return null;
+    }
+
 }
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/VerifyDTAPNEngineOptions.java b/src/main/java/net/tapaal/gui/petrinet/verification/VerifyDTAPNEngineOptions.java
index ffddad306..c17a2abc8 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/VerifyDTAPNEngineOptions.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/VerifyDTAPNEngineOptions.java
@@ -20,7 +20,8 @@ public VerifyDTAPNEngineOptions() {
             true, //support EG or AF with net degree > 2);
             false, //support for nested quantification
             true,
-            false
+            false,
+            true
         );
     }
 }
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/VerifyPNEngineOptions.java b/src/main/java/net/tapaal/gui/petrinet/verification/VerifyPNEngineOptions.java
index 38c87d073..9a035a0d4 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/VerifyPNEngineOptions.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/VerifyPNEngineOptions.java
@@ -20,7 +20,8 @@ public VerifyPNEngineOptions() {
             true, //support EG or AF with net degree > 2
             true,//support for nested quantification
             true,
-            true
+            true,
+            false
         );
     }
 }
\ No newline at end of file
diff --git a/src/main/java/net/tapaal/gui/petrinet/verification/VerifyTAPNEngineOptions.java b/src/main/java/net/tapaal/gui/petrinet/verification/VerifyTAPNEngineOptions.java
index 230252a01..6df2146e3 100644
--- a/src/main/java/net/tapaal/gui/petrinet/verification/VerifyTAPNEngineOptions.java
+++ b/src/main/java/net/tapaal/gui/petrinet/verification/VerifyTAPNEngineOptions.java
@@ -20,6 +20,7 @@ public VerifyTAPNEngineOptions() {
             false, // support EG or AF with net degree > 2
             false, // support for nested quantification
             true,
+            false,
             false
         );
     }
diff --git a/src/main/java/net/tapaal/gui/petrinet/widgets/QueryPane.java b/src/main/java/net/tapaal/gui/petrinet/widgets/QueryPane.java
index e314db851..fd04dc7fe 100644
--- a/src/main/java/net/tapaal/gui/petrinet/widgets/QueryPane.java
+++ b/src/main/java/net/tapaal/gui/petrinet/widgets/QueryPane.java
@@ -27,6 +27,7 @@
 import net.tapaal.gui.petrinet.undo.MoveElementUpCommand;
 import net.tapaal.resourcemanager.ResourceManager;
 import net.tapaal.gui.petrinet.verification.TAPNQuery;
+import net.tapaal.gui.petrinet.verification.TAPNQuery.QueryCategory;
 import pipe.gui.MessengerImpl;
 import net.tapaal.gui.petrinet.dialog.QueryDialog;
 import net.tapaal.gui.petrinet.verification.Verifier;
@@ -42,6 +43,7 @@
 import net.tapaal.gui.swingcomponents.NonsearchableJList;
 import dk.aau.cs.translations.ReductionOption;
 import dk.aau.cs.util.Require;
+import javax.swing.JOptionPane;
 
 public class QueryPane extends JPanel implements SidePane {
 
@@ -451,6 +453,13 @@ private void verifyQuery() {
 		TAPNQuery query = queryList.getSelectedValue();
 		int NumberOfSelectedElements = queryList.getSelectedIndices().length;
 		
+		boolean isSmc = query.getCategory() == QueryCategory.SMC;
+
+		if (isSmc && !tabContent.network().isNonStrict()) {
+			JOptionPane.showMessageDialog(null, "The model has strict intervals and can therefore not be verified", "Error", JOptionPane.ERROR_MESSAGE);
+			return;
+		}
+
 		if (NumberOfSelectedElements == 1) {
 			if (query.getReductionOption() == ReductionOption.VerifyTAPN || query.getReductionOption() == ReductionOption.VerifyDTAPN || query.getReductionOption() == ReductionOption.VerifyPN)
 				Verifier.runVerifyTAPNVerification(tabContent.network(), query, null, tabContent.getGuiModels(), false, tabContent.lens);
diff --git a/src/main/java/pipe/gui/GuiFrame.java b/src/main/java/pipe/gui/GuiFrame.java
index 9a0a6a0c5..2442f26a5 100644
--- a/src/main/java/pipe/gui/GuiFrame.java
+++ b/src/main/java/pipe/gui/GuiFrame.java
@@ -68,6 +68,7 @@ public class GuiFrame extends JFrame implements GuiFrameActions, SafeGuiFrameAct
     private final JComboBox<String> timeFeatureOptions = new JComboBox<>(new String[]{"No", "Yes"});
     private final JComboBox<String> gameFeatureOptions = new JComboBox<>(new String[]{"No", "Yes"});
     private final JComboBox<String> colorFeatureOptions = new JComboBox<>(new String[]{"No", "Yes"});
+    private final JComboBox<String> stochasticFeatureOptions = new JComboBox<>(new String[]{"No", "Yes"});
 
     private static final String FIT_TO_SCREEN_NAME = "Fit to screen";
     private static final String FIT_TO_SCREEN_TOOLTIP = "Fit the net to the screen";
@@ -462,6 +463,7 @@ public void actionPerformed(ActionEvent e) {
         public void actionPerformed(ActionEvent e) {
             boolean isTime = timeFeatureOptions.getSelectedIndex() != 0;
             currentTab.ifPresent(o -> o.changeTimeFeature(isTime));
+            refreshLensConstraints();
         }
     };
 
@@ -469,6 +471,7 @@ public void actionPerformed(ActionEvent e) {
         public void actionPerformed(ActionEvent e) {
             boolean isGame = gameFeatureOptions.getSelectedIndex() != 0;
             currentTab.ifPresent(o -> o.changeGameFeature(isGame));
+            refreshLensConstraints();
         }
     };
 
@@ -476,6 +479,15 @@ public void actionPerformed(ActionEvent e) {
         public void actionPerformed(ActionEvent e) {
             boolean isColor = colorFeatureOptions.getSelectedIndex() != 0;
             currentTab.ifPresent(o -> o.changeColorFeature(isColor));
+            refreshLensConstraints();
+        }
+    };
+
+    private final GuiAction changeStochasticFeatureAction = new GuiAction("Stochastic", "Change stochastic semantics") {
+        public void actionPerformed(ActionEvent actionEvent) {
+            boolean isStochastic = stochasticFeatureOptions.getSelectedIndex() != 0;
+            currentTab.ifPresent(o -> o.changeStochasticFeature(isStochastic));
+            refreshLensConstraints();
         }
     };
 
@@ -534,9 +546,12 @@ protected void closeTab(PetriNetTab tab) {
         featurePanel.add(gameFeatureOptions);
         featurePanel.add(new JLabel("   Color: "));
         featurePanel.add(colorFeatureOptions);
+        featurePanel.add(new JLabel("   Stochastic: "));
+        featurePanel.add(stochasticFeatureOptions);
         timeFeatureOptions.addActionListener(changeTimeFeatureAction);
         gameFeatureOptions.addActionListener(changeGameFeatureAction);
         colorFeatureOptions.addActionListener(changeColorFeatureAction);
+        stochasticFeatureOptions.addActionListener(changeStochasticFeatureAction);
 
         JPanel bottomPanel = new JPanel();
         bottomPanel.setLayout(new GridLayout(1, 2));
@@ -1003,6 +1018,8 @@ private void enableGUIActions(GUIMode mode) {
                 timeFeatureOptions.setEnabled(true);
                 gameFeatureOptions.setEnabled(true);
                 colorFeatureOptions.setEnabled(true);
+                stochasticFeatureOptions.setEnabled(true);
+                refreshLensConstraints();
 
                 //Enable editor focus traversal policy
                 setFocusTraversalPolicy(new EditorFocusTraversalPolicy());
@@ -1042,6 +1059,7 @@ private void enableGUIActions(GUIMode mode) {
                 timeFeatureOptions.setEnabled(false);
                 gameFeatureOptions.setEnabled(false);
                 colorFeatureOptions.setEnabled(false);
+                stochasticFeatureOptions.setEnabled(false);
 
                 //Enable simulator focus traversal policy
                 setFocusTraversalPolicy(new SimulatorFocusTraversalPolicy(getCurrentTab().getAnimationController().TimeDelayField));
@@ -1073,6 +1091,7 @@ private void enableGUIActions(GUIMode mode) {
                 timeFeatureOptions.setEnabled(false);
                 gameFeatureOptions.setEnabled(false);
                 colorFeatureOptions.setEnabled(false);
+                stochasticFeatureOptions.setEnabled(false);
 
 
                 enableAllActions(false);
@@ -1528,12 +1547,14 @@ private JMenu buildExampleMenu() {
         // .xml file the Example x counter is not incremented when that file
         // is ignored
         if (nets != null && nets.length > 0) {
-            TAPNLens untimedLens = new TAPNLens(false, false, false);
-            TAPNLens timedLens = new TAPNLens(true, false, false);
-            TAPNLens untimedGameLens = new TAPNLens(false, true, false);
-            TAPNLens timedGameLens = new TAPNLens(true, true, false);
-            TAPNLens untimedColorLens = new TAPNLens(false, false, true);
-            TAPNLens timedColorLens = new TAPNLens(true, false, true);
+            TAPNLens untimedLens = new TAPNLens(false, false, false, false);
+            TAPNLens timedLens = new TAPNLens(true, false, false, false);
+            TAPNLens untimedGameLens = new TAPNLens(false, true, false, false);
+            TAPNLens timedGameLens = new TAPNLens(true, true, false, false);
+            TAPNLens untimedColorLens = new TAPNLens(false, false, true, false);
+            TAPNLens timedColorLens = new TAPNLens(true, false, true, false);
+            TAPNLens timedStochasticLens = new TAPNLens(true, false, false, true);
+            TAPNLens timedColorStochasticLens = new TAPNLens(true, false, true, true);
 
             HashMap<TAPNLens, List<String>> netMap = new HashMap<>(){{
                     put(untimedLens, new ArrayList<>());
@@ -1542,6 +1563,8 @@ private JMenu buildExampleMenu() {
                     put(timedGameLens, new ArrayList<>());
                     put(untimedColorLens, new ArrayList<>());
                     put(timedColorLens, new ArrayList<>());
+                    put(timedStochasticLens, new ArrayList<>());
+                    put(timedColorStochasticLens, new ArrayList<>());
             }};
 
             for (String filename : nets) {
@@ -1553,11 +1576,11 @@ private JMenu buildExampleMenu() {
                     try {
                         lens = PetriNetTab.getFileLens(file);
                         if (lens == null) {
-                            lens = new TAPNLens(true, false, false);
+                            lens = new TAPNLens(true, false, false, false);
                         }
                         TAPNLens tmp = lens;
                         netMap.forEach((v, k) -> {
-                            if (v.isTimed() == tmp.isTimed() && v.isGame() == tmp.isGame() && v.isColored() == tmp.isColored()) k.add(filename);
+                            if (v.isTimed() == tmp.isTimed() && v.isGame() == tmp.isGame() && v.isColored() == tmp.isColored() && v.isStochastic() == tmp.isStochastic()) k.add(filename);
                         });
                     } catch (Exception e) {
                         if (netMap.containsKey(timedLens)) netMap.get(timedLens).add(filename);
@@ -1592,6 +1615,14 @@ private JMenu buildExampleMenu() {
             charKey = countCharKey(charKey, netMap.get(untimedColorLens).size());
             exampleMenu.add(addExampleNets(netMap.get(timedColorLens), "Timed-Arc Colored Petri nets", charKey, modifier));
 
+            modifier = getModifier(modifier, charKey, netMap.get(timedColorLens).size());
+            charKey = countCharKey(charKey, netMap.get(timedColorLens).size());
+            exampleMenu.add(addExampleNets(netMap.get(timedStochasticLens), "Timed-Arc Stochastic Petri nets", charKey, modifier));
+
+            modifier = getModifier(modifier, charKey, netMap.get(timedStochasticLens).size());
+            charKey = countCharKey(charKey, netMap.get(timedStochasticLens).size());
+            exampleMenu.add(addExampleNets(netMap.get(timedColorStochasticLens), "Timed-Arc Stochastic Colored Petri nets", charKey, modifier));
+
             return exampleMenu;
         }
         return null;
@@ -1794,6 +1825,18 @@ public void setFeatureInfoText(boolean[] features) {
             timeFeatureOptions.setSelectedIndex(features[0] ? 1 : 0);
             gameFeatureOptions.setSelectedIndex(features[1] ? 1 : 0);
             colorFeatureOptions.setSelectedIndex(features[2] ? 1 : 0);
+            stochasticFeatureOptions.setSelectedIndex(features[3] ? 1 : 0);
         }
+        refreshLensConstraints();
+    }
+
+    public void refreshLensConstraints() {
+        boolean stochasticEnabled = stochasticFeatureOptions.getSelectedIndex() != 0;
+        timeFeatureOptions.setEnabled(!stochasticEnabled);
+        gameFeatureOptions.setEnabled(!stochasticEnabled);
+        stochasticFeatureOptions.setEnabled(
+            timeFeatureOptions.getSelectedIndex() != 0 &&
+                gameFeatureOptions.getSelectedIndex() == 0
+        );
     }
 }
diff --git a/src/main/java/pipe/gui/graph/Graph.java b/src/main/java/pipe/gui/graph/Graph.java
new file mode 100644
index 000000000..73bd32599
--- /dev/null
+++ b/src/main/java/pipe/gui/graph/Graph.java
@@ -0,0 +1,57 @@
+package pipe.gui.graph;
+
+import java.util.List;
+
+public class Graph {
+    private final String name;
+    private final List<GraphPoint> points;
+    private final Double mean;
+    private final String xAxisLabel;
+    private final String yAxisLabel;
+    private final String buttonText;
+
+    public Graph(String name, List<GraphPoint> points, Double mean, String xAxisLabel, String yAxisLabel, String buttonText) {
+        this.name = name;
+        this.points = points;
+        this.mean = mean;
+        this.xAxisLabel = xAxisLabel;
+        this.yAxisLabel = yAxisLabel;
+        this.buttonText = buttonText;
+    }
+
+    public Graph(String name, List<GraphPoint> points, String xAxisLabel, String yAxisLabel, String buttonText) {
+        this(name, points, null, xAxisLabel, yAxisLabel, buttonText);
+    }
+
+    public Graph(String name, List<GraphPoint> points, Double mean) {
+        this(name, points, mean, "X axis", "Y axis", null);
+    }
+
+    public Graph(String name, List<GraphPoint> points) {
+        this(name, points, null);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<GraphPoint> getPoints() {
+        return points;
+    }
+
+    public Double getMean() {
+        return mean;
+    }
+
+    public String getXAxisLabel() {
+        return xAxisLabel;
+    }
+
+    public String getYAxisLabel() {
+        return yAxisLabel;
+    }
+
+    public String getButtonText() {
+        return buttonText;
+    }
+}
diff --git a/src/main/java/pipe/gui/graph/GraphDialog.java b/src/main/java/pipe/gui/graph/GraphDialog.java
new file mode 100644
index 000000000..b69617e88
--- /dev/null
+++ b/src/main/java/pipe/gui/graph/GraphDialog.java
@@ -0,0 +1,278 @@
+package pipe.gui.graph;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.BasicStroke;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.Shape;
+import java.awt.geom.Line2D;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+
+import org.jfree.chart.ChartFactory;
+import org.jfree.chart.ChartPanel;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.LegendItem;
+import org.jfree.chart.LegendItemCollection;
+import org.jfree.chart.annotations.XYLineAnnotation;
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
+import org.jfree.data.xy.XYDataset;
+import org.jfree.data.xy.XYSeries;
+import org.jfree.data.xy.XYSeriesCollection;
+
+import dk.aau.cs.util.Require;
+import pipe.gui.TAPAALGUI;
+import pipe.gui.swingcomponents.EscapableDialog;
+
+public class GraphDialog extends EscapableDialog {
+    private final List<Graph> graphs;
+    
+    private boolean showLegend;
+    private boolean piecewise;
+    private boolean pointPlot;
+    private boolean isStraight;
+    private double distanceToOrigin;
+    private Double mean;
+
+    private boolean hasZeroPoint;   
+    private boolean hasZeroX;
+    private boolean hasZeroY;
+
+    private GraphDialog(List<Graph> graphs, String title, boolean showLegend, boolean piecewise, boolean pointPlot) {
+        super(TAPAALGUI.getAppGui(), title, true);
+        this.graphs = graphs;
+        this.showLegend = showLegend;
+        this.piecewise = piecewise;
+        this.pointPlot = pointPlot;
+    }
+
+    public static class GraphDialogBuilder {
+        private List<Graph> graphs = new ArrayList<>();
+    
+        private String title;
+        private boolean showLegend;
+        private boolean piecewise;
+        private boolean pointPlot;
+
+        public GraphDialogBuilder addGraphs(List<Graph> graphs) {
+            this.graphs.addAll(graphs);
+            return this;
+        }
+
+        public GraphDialogBuilder addGraph(Graph graph) {
+            this.graphs.add(graph);
+            return this;
+        }
+
+        public GraphDialogBuilder setTitle(String title) {
+            this.title = title;
+            return this;
+        }
+
+        public GraphDialogBuilder setShowLegend(boolean showLegend) {
+            this.showLegend = showLegend;
+            return this;
+        }
+
+        public GraphDialogBuilder setPiecewise(boolean piecewise) {
+            this.piecewise = piecewise;
+            return this;
+        }
+
+        public GraphDialogBuilder setPointPlot(boolean pointPlot) {
+            this.pointPlot = pointPlot;
+            return this;
+        }
+
+        public GraphDialog build() {
+            GraphDialog dialog = new GraphDialog(graphs, title, showLegend, piecewise, pointPlot);
+            return dialog;
+        }
+
+    }
+
+    public void display() {
+        if (piecewise || graphs.size() < 2) {
+            displayWithoutButtons();
+        } else {
+            displayWithButtons();
+        }
+    }
+
+    private void displayWithoutButtons() {
+        JFreeChart chart = createChart(graphs);
+        ChartPanel chartPanel = createChartPanel(chart);
+
+        setLayout(new BorderLayout());
+        add(chartPanel, BorderLayout.CENTER);
+
+        setupDialog();
+    }
+
+    private void displayWithButtons() {
+        CardLayout cardLayout = new CardLayout();
+        JPanel cardPanel = new JPanel(cardLayout);
+        JPanel buttonPanel = new JPanel();
+
+        for (Graph graph : graphs) {
+            JFreeChart chart = createChart(Collections.singletonList(graph));
+            ChartPanel chartPanel = createChartPanel(chart);
+
+            String buttonText = graph.getButtonText();
+            if (buttonText != null) {
+                cardPanel.add(chartPanel, buttonText);
+                addButton(buttonPanel, cardLayout, cardPanel, buttonText);
+            } else {
+                cardPanel.add(chartPanel, graph.getButtonText());
+                addButton(buttonPanel, cardLayout, cardPanel, graph.getButtonText());
+            }
+        }
+
+        setLayout(new BorderLayout());
+        add(cardPanel, BorderLayout.CENTER);
+        add(buttonPanel, BorderLayout.SOUTH);
+
+        setupDialog();
+    }
+
+    private void setupDialog() {
+        setSize(800, 600);
+        setLocationRelativeTo(getOwner());
+        setVisible(true);
+    }
+
+    private ChartPanel createChartPanel(JFreeChart chart) {
+        ChartPanel chartPanel = new ChartPanel(chart);
+        chartPanel.setMouseWheelEnabled(true);
+        return chartPanel;
+    }
+
+    private void addButton(JPanel buttonPanel, CardLayout cardLayout, JPanel cardPanel, String buttonText) {
+        JButton button = new JButton(buttonText);
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                cardLayout.show(cardPanel, buttonText);
+            }
+        });
+
+        buttonPanel.add(button);
+        buttonPanel.setBackground(Color.WHITE);
+    }
+
+    private JFreeChart createChart(List<Graph> graphs) {
+        XYDataset dataset = constructDataset(graphs);
+
+        JFreeChart chart;
+        if (graphs.isEmpty()) {
+            chart = ChartFactory.createXYLineChart("", "X", "Y", dataset, PlotOrientation.VERTICAL, false, true, false);
+        } else {
+            chart = ChartFactory.createXYLineChart(graphs.get(0).getName(), graphs.get(0).getXAxisLabel(), graphs.get(0).getYAxisLabel(), dataset, PlotOrientation.VERTICAL, showLegend || mean != null, true, false);
+        }
+
+        XYPlot plot = chart.getXYPlot();
+        float lineThickness = 3.0f;
+
+        final double negativeMargin = -0.05;
+        if (hasZeroPoint) {
+            ValueAxis domainAxis = plot.getDomainAxis();
+            domainAxis.setRange(negativeMargin, domainAxis.getUpperBound());
+            ValueAxis rangeAxis = plot.getRangeAxis();
+            rangeAxis.setRange(negativeMargin, rangeAxis.getUpperBound());
+        } else if (hasZeroX) {
+            ValueAxis domainAxis = plot.getDomainAxis();
+            domainAxis.setRange(negativeMargin, domainAxis.getUpperBound());
+        } else if (hasZeroY) {
+            ValueAxis rangeAxis = plot.getRangeAxis();
+            rangeAxis.setRange(negativeMargin, rangeAxis.getUpperBound());
+        }
+
+        if (isStraight) {
+            ValueAxis domainAxis = plot.getDomainAxis();
+            domainAxis.setRange(distanceToOrigin - 1, distanceToOrigin + 1);
+        } else if (mean != null) {
+            ValueAxis rangeAxis = plot.getRangeAxis();
+            float[] dashPattern = { 5.0f, 5.0f };
+            BasicStroke dashed = new BasicStroke(lineThickness, 
+                                                BasicStroke.CAP_BUTT,
+                                                BasicStroke.JOIN_MITER, 
+                                                10.0f, 
+                                                dashPattern,
+                                                0.0f);
+
+            XYLineAnnotation annotation = new XYLineAnnotation(mean, rangeAxis.getLowerBound(), mean, rangeAxis.getUpperBound(), dashed, Color.BLACK);
+            plot.addAnnotation(annotation);
+
+            Shape lineShape = new Line2D.Double(0, 0, 30, 0);
+            LegendItemCollection legendItems;
+            
+            legendItems = showLegend ? plot.getLegendItems() : new LegendItemCollection();
+            legendItems.add(new LegendItem("Mean", null, null, null, lineShape, Color.BLACK, dashed, Color.BLACK));
+            plot.setFixedLegendItems(legendItems);
+        }
+
+        XYLineAndShapeRenderer renderer = new XYLineAndShapeRenderer();
+        Color lineColor = Color.RED;
+        for (int i = 0; i < dataset.getSeriesCount(); ++i) {
+            renderer.setSeriesStroke(i, new BasicStroke(lineThickness));
+            renderer.setSeriesShapesVisible(i, pointPlot);
+            renderer.setSeriesLinesVisible(i, !pointPlot);
+            renderer.setSeriesPaint(i, lineColor);
+        }
+
+        plot.setRenderer(renderer);
+        plot.setBackgroundPaint(Color.WHITE);
+        plot.setRangeGridlinePaint(Color.BLACK);
+        plot.setDomainGridlinePaint(Color.BLACK);
+
+        return chart;
+    }
+
+    private XYDataset constructDataset(List<Graph> graphs) {
+        XYSeriesCollection dataset = new XYSeriesCollection();
+        
+        hasZeroPoint = false;
+        hasZeroX = false;
+        hasZeroY = false;
+        
+        for (Graph graph : graphs) {
+            XYSeries series = new XYSeries(graph.getName());
+            List<GraphPoint> points = graph.getPoints();
+
+            double margin = 1e-5;
+            if (!points.isEmpty()) {
+                double first = points.get(0).getX();
+                double last = points.get(points.size() - 1).getX();
+
+                isStraight = Math.abs(first - last) < margin && !piecewise;
+                distanceToOrigin = first;
+            }
+
+            if (graph.getMean() != null) {
+                mean = graph.getMean();
+            }
+
+            for (GraphPoint point : points) {
+                Require.that(point.getX() >= 0 && point.getY() >= 0, "Negative points are not supported");
+
+                series.add(point.getX(), point.getY());
+
+                hasZeroX = point.getX() < margin || hasZeroX;
+                hasZeroY = point.getY() < margin || hasZeroY;
+            }
+            
+            hasZeroPoint = hasZeroX && hasZeroY;
+            dataset.addSeries(series);
+        }
+        
+        return dataset;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/pipe/gui/graph/GraphPoint.java b/src/main/java/pipe/gui/graph/GraphPoint.java
new file mode 100644
index 000000000..b89bc8948
--- /dev/null
+++ b/src/main/java/pipe/gui/graph/GraphPoint.java
@@ -0,0 +1,19 @@
+package pipe.gui.graph;
+
+public class GraphPoint {
+    private final double x;
+    private final double y;
+
+    public GraphPoint(double x, double y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public double getX() {
+        return x;
+    }
+
+    public double getY() {
+        return y;
+    }
+}
diff --git a/src/main/java/pipe/gui/petrinet/Export.java b/src/main/java/pipe/gui/petrinet/Export.java
index d94949fc6..27edd59e2 100644
--- a/src/main/java/pipe/gui/petrinet/Export.java
+++ b/src/main/java/pipe/gui/petrinet/Export.java
@@ -100,10 +100,12 @@ public static void toQueryXML(TimedArcPetriNetNetwork network, String filename,
             LTLQueryVisitor LTLXMLVisitor = new LTLQueryVisitor();
             HyperLTLQueryVisitor HyperLTLXMLVisitor = new HyperLTLQueryVisitor();
             CTLQueryVisitor CTLXMLVisitor = new CTLQueryVisitor();
+            SMCQueryVisitor SMCXMLVisitor = new SMCQueryVisitor();
 
             while (queryIterator.hasNext()) {
                 boolean isCTL = false;
                 boolean isHyperLTL = false;
+                boolean isSMC = false;
                 TAPNQuery clonedQuery = queryIterator.next().copy();
 
                 // Attempt to parse and possibly transform the string query using the manual edit parser
@@ -114,6 +116,9 @@ public static void toQueryXML(TimedArcPetriNetNetwork network, String filename,
                     } else if (clonedQuery.getCategory().equals((TAPNQuery.QueryCategory.HyperLTL))) {
                         isHyperLTL = true;
                         newProperty = TAPAALHyperLTLQueryParser.parse(clonedQuery.getProperty().toString());
+                    } else if (clonedQuery.getCategory().equals((TAPNQuery.QueryCategory.SMC))) {
+                        isSMC = true;
+                        newProperty = TAPAALLTLQueryParser.parse(clonedQuery.getProperty().toString());
                     } else {
                         newProperty = TAPAALCTLQueryParser.parse(clonedQuery.getProperty().toString());
                         isCTL = true;
@@ -125,6 +130,8 @@ public static void toQueryXML(TimedArcPetriNetNetwork network, String filename,
                 newProperty.accept(new RenameAllTransitionsVisitor(mapping), null);
                 if (isHyperLTL) {
                     HyperLTLXMLVisitor.buildXMLQuery(newProperty, clonedQuery.getName());
+                } else if (isSMC) {
+                    SMCXMLVisitor.buildXMLQuery(newProperty, clonedQuery.getName(), clonedQuery.getSmcSettings());
                 } else if (!isCTL) {
                     LTLXMLVisitor.buildXMLQuery(newProperty, clonedQuery.getName());
                 } else {
@@ -149,7 +156,7 @@ public static void toVerifyTAPN(TimedArcPetriNetNetwork network, Iterable<TAPNQu
         Tuple<TimedArcPetriNet, NameMapping> transformedModel = composer.transformModel(network);
         TimedArcPetriNet model = transformedModel.value1();
 
-        TAPNLens lens = new TAPNLens(!model.isUntimed(), model.hasUncontrollableTransitions(), model.isColored());
+        TAPNLens lens = new TAPNLens(!model.isUntimed(), model.hasUncontrollableTransitions(), model.isColored(), model.isStochastic());
 
         RenameAllPlacesVisitor visitor = new RenameAllPlacesVisitor(transformedModel.value2());
         int i = 0;
@@ -158,9 +165,9 @@ public static void toVerifyTAPN(TimedArcPetriNetNetwork network, Iterable<TAPNQu
             i++;
 
             if (lens.isGame() && isDTAPN) {
-                exporter.export(model, new dk.aau.cs.model.tapn.TAPNQuery(query.getProperty(), 0), new File(modelFile), new File(queryFile + i + ".xml"), null, lens, transformedModel.value2(), composer.getGuiModel());
+                exporter.export(model, new dk.aau.cs.model.tapn.TAPNQuery(query.getProperty(), 0, query.getSmcSettings()), new File(modelFile), new File(queryFile + i + ".xml"), null, lens, transformedModel.value2(), composer.getGuiModel());
             } else {
-                exporter.export(model, new dk.aau.cs.model.tapn.TAPNQuery(query.getProperty(), 0), new File(modelFile), new File(queryFile + i + ".xml"), null, new TAPNLens(true, false, lens.isColored()), transformedModel.value2(), composer.getGuiModel());
+                exporter.export(model, new dk.aau.cs.model.tapn.TAPNQuery(query.getProperty(), 0, query.getSmcSettings()), new File(modelFile), new File(queryFile + i + ".xml"), null, new TAPNLens(true, false, lens.isColored(), lens.isStochastic()), transformedModel.value2(), composer.getGuiModel());
             }
         }
     }
diff --git a/src/main/java/pipe/gui/petrinet/PetriNetTab.java b/src/main/java/pipe/gui/petrinet/PetriNetTab.java
index 6980e3223..ca560b7a9 100644
--- a/src/main/java/pipe/gui/petrinet/PetriNetTab.java
+++ b/src/main/java/pipe/gui/petrinet/PetriNetTab.java
@@ -95,19 +95,20 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Arrays;
+
 public class PetriNetTab extends JSplitPane implements TabActions {
-    
+
     final AbstractDrawingSurfaceManager notingManager = new AbstractDrawingSurfaceManager(){
         @Override
         public void registerEvents() {}
     };
-    
+
     private final MutableReference<GuiFrameControllerActions> guiFrameControllerActions = new MutableReference<>();
-    
+
     public void setGuiFrameControllerActions(GuiFrameControllerActions guiFrameControllerActions) {
         this.guiFrameControllerActions.setReference(guiFrameControllerActions);
     }
-    
+
     //Enum for all actions and types of elements
     public enum DrawTool {
         ANNOTATION,
@@ -125,55 +126,55 @@ public enum DrawTool {
         DRAW,
         DRAG,
     }
-    
+
     public final TAPNLens lens;
-    
+
 	//Model and state
 	private final TimedArcPetriNetNetwork tapnNetwork;
-    
+
 	//XXX: Replace with bi-map
 	private final HashMap<TimedArcPetriNet, DataLayer> guiModels = new HashMap<>();
 	public final HashMap<DataLayer, TimedArcPetriNet> guiModelToModel = new HashMap<>();
-    
+
 	//XXX: should be replaced iwth DataLayer->Zoomer, TimedArcPetriNet has nothing to do with zooming
 	private final HashMap<TimedArcPetriNet, Zoomer> zoomLevels = new HashMap<>();
-    
+
     private boolean alreadyFitToScreen;
-    
+
 	final UndoManager undoManager = new UndoManager(this); //warning leaking this, should be ok as it only used after construction
-    
+
     private final MutableReference<GuiFrameActions> app = new MutableReference<>();
     private final MutableReference<SafeGuiFrameActions> safeApp = new MutableReference<>();
-    
+
     final MutableReference<AbstractDrawingSurfaceManager> managerRef = new MutableReference<>(notingManager);
 	public final GuiModelManager guiModelManager = new GuiModelManager(this);
-    
+
     private final Animator animator = new Animator(this);
     private boolean netChanged = false;
-    
+
     @Override
     public boolean getNetChanged() {
         return netChanged;
     }
-    
+
     public void setNetChanged(boolean _netChanged) {
         netChanged = _netChanged;
     }
     private final NameGenerator nameGenerator = new NameGenerator();
-    
+
     public NameGenerator getNameGenerator() {
         return nameGenerator;
     }
-    
+
     /**
      * Creates a new tab with the selected filestream
 	 */
     public static PetriNetTab createNewTabFromInputStream(InputStream file, String name) throws Exception {
-        
+
         try {
             ModelLoader loader = new ModelLoader();
 			LoadedModel loadedModel = loader.load(file);
-            
+
 			if (loadedModel == null) {
                 throw new Exception("Could not open the selected file, as it does not have the correct format.");
 			}
@@ -185,13 +186,13 @@ public static PetriNetTab createNewTabFromInputStream(InputStream file, String n
                     for (String s : loadedModel.getMessages()) {
                         message.append(s).append("\n\n");
                     }
-                    
+
                     new MessengerImpl().displayInfoMessage(message.toString(), "Warning");
                 }).start();
             }
 
             PetriNetTab tab = new PetriNetTab(loadedModel.network(), loadedModel.templates(), loadedModel.queries(), loadedModel.getLens());
-            
+
             checkQueries(tab);
 
             tab.setInitialName(name);
@@ -205,16 +206,16 @@ public static PetriNetTab createNewTabFromInputStream(InputStream file, String n
             throw new Exception("TAPAAL encountered an error while loading the file: " + name + "\n\nPossible explanations:\n  - " + e.getMessage(), e);
         }
 	}
-    
+
     public static TAPNLens getFileLens(InputStream file) throws Exception {
         ModelLoader loader = new ModelLoader();
         return loader.loadLens(file);
     }
-    
+
     public static void checkQueries(PetriNetTab tab) {
         List<TAPNQuery> queriesToRemove = new ArrayList<>();
         boolean gameChanged = false;
-        
+
         EngineSupportOptions verifyTAPNOptions = new VerifyTAPNEngineOptions();
         EngineSupportOptions UPPAALCombiOptions = new UPPAALCombiOptions();
         EngineSupportOptions UPPAALOptimizedStandardOptions = new UPPAALOptimizedStandardOptions();
@@ -224,9 +225,10 @@ public static void checkQueries(PetriNetTab tab) {
         EngineSupportOptions verifyDTAPNOptions = new VerifyDTAPNEngineOptions();
         EngineSupportOptions verifyPNOptions = new VerifyPNEngineOptions();
         EngineSupportOptions[] engineSupportOptions = new EngineSupportOptions[]{verifyDTAPNOptions,verifyTAPNOptions,UPPAALCombiOptions,UPPAALOptimizedStandardOptions,UPPAALStandardOptions,UPPAALBroadcastOptions,UPPAALBroadcastDegree2Options,verifyPNOptions};
-        
+
         TimedArcPetriNetNetwork net = tab.network();
         for (TAPNQuery q : tab.queries()) {
+            boolean smcQuery = q.getCategory() == TAPNQuery.QueryCategory.SMC;
             boolean[] queryOptions = new boolean[]{
                 q.getTraceOption() == TAPNQuery.TraceOption.FASTEST,
                 (q.getProperty() instanceof TCTLDeadlockNode && (q.getProperty() instanceof TCTLEFNode || q.getProperty() instanceof TCTLAGNode) && net.getHighestNetDegree() <= 2),
@@ -243,7 +245,8 @@ public static void checkQueries(PetriNetTab tab) {
                 (q.getProperty() instanceof TCTLEGNode || q.getProperty() instanceof TCTLAFNode) && net.getHighestNetDegree() > 2,
                 q.hasUntimedOnlyProperties(),
                 tab.lens.isColored(),
-                tab.lens.isColored() && !tab.lens.isTimed()
+                tab.lens.isColored() && !tab.lens.isTimed(),
+                smcQuery
             };
 
             boolean hasEngine = tab.checkCurrentEngine(q.getReductionOption(), queryOptions);
@@ -305,12 +308,12 @@ public static void checkQueries(PetriNetTab tab) {
             //XXX: we should not do pop-up form there! I think these check should be part of loading a net.
             new Thread(() -> {
                 TAPAALGUI.getAppGui().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-                
+
                 new MessengerImpl().displayInfoMessage(fmessage, "Information");
             }).start();
         }
 	}
-    
+
 	private boolean checkCurrentEngine(ReductionOption reductionOption, boolean[] queryOptions) {
         EngineSupportOptions engine;
         switch (reductionOption) {
@@ -365,8 +368,8 @@ private TAPNQuery setQueryEngine(TAPNQuery query, EngineSupportOptions engine) {
 	    return query;
     }
 
-	public static PetriNetTab createNewEmptyTab(String name, boolean isTimed, boolean isGame, boolean isColored){
-        PetriNetTab tab = new PetriNetTab(isTimed, isGame, isColored);
+	public static PetriNetTab createNewEmptyTab(String name, boolean isTimed, boolean isGame, boolean isColored, boolean isStochastic){
+        PetriNetTab tab = new PetriNetTab(isTimed, isGame, isColored, isStochastic);
 		tab.setInitialName(name);
 
 		//Set Default Template
@@ -503,8 +506,8 @@ public UndoManager getUndoManager() {
     private Boolean isPlaceOption = null;
     private Boolean isTransitionOption = null;
 
-    private PetriNetTab(boolean isTimed, boolean isGame, boolean isColored) {
-	    this(new TimedArcPetriNetNetwork(), new ArrayList<>(), new TAPNLens(isTimed, isGame, isColored));
+    private PetriNetTab(boolean isTimed, boolean isGame, boolean isColored, boolean isStochastic) {
+	    this(new TimedArcPetriNetNetwork(), new ArrayList<>(), new TAPNLens(isTimed, isGame, isColored, isStochastic));
     }
 
 	private PetriNetTab(TimedArcPetriNetNetwork network, Collection<Template> templates, TAPNLens lens) {
@@ -1132,7 +1135,7 @@ public void zoomTo(int newZoomLevel) {
                     zoomSlider.addChangeListener(listener);
                 }
             });
-            
+
 			drawingSurface().zoomToMidPoint(); //Do Zoom
 		}
 	}
@@ -1165,29 +1168,36 @@ public void setResizeingDefault(){
 	}
 
     private void createNewAndConvertUntimed() {
-	    PetriNetTab tab = duplicateTab(new TAPNLens(false, lens.isGame(), lens.isColored()), "-untimed");
+	    PetriNetTab tab = duplicateTab(new TAPNLens(false, lens.isGame(), lens.isColored(), lens.isStochastic()), "-untimed");
         convertToUntimedTab(tab);
         guiFrameControllerActions.ifPresent(o -> o.openTab(tab));
     }
 
     private void createNewAndConvertNonGame() {
-        PetriNetTab tab = duplicateTab(new TAPNLens(lens.isTimed(), false, lens.isColored()), "-nongame");
+        PetriNetTab tab = duplicateTab(new TAPNLens(lens.isTimed(), false, lens.isColored(), lens.isStochastic()), "-nongame");
         TabTransformer.removeGameInformation(tab);
         guiFrameControllerActions.ifPresent(o -> o.openTab(tab));
     }
 
     private void createNewAndConvertNonColor(){
-        PetriNetTab tab = duplicateTab(new TAPNLens(lens.isTimed(), lens.isGame(), false), "-noncolored");
+        PetriNetTab tab = duplicateTab(new TAPNLens(lens.isTimed(), lens.isGame(), false, lens.isStochastic()), "-noncolored");
         TabTransformer.removeColorInformation(tab);
         guiFrameControllerActions.ifPresent(o -> o.openTab(tab));
     }
 
     private void createNewAndConvertColor(){
-        PetriNetTab tab = duplicateTab(new TAPNLens(lens.isTimed(), lens.isGame(), true), "-colored");
+        PetriNetTab tab = duplicateTab(new TAPNLens(lens.isTimed(), lens.isGame(), true, lens.isStochastic()), "-colored");
         TabTransformer.addColorInformation(tab);
         guiFrameControllerActions.ifPresent(o -> o.openTab(tab));
     }
 
+    private void createNewAndConvertNonStochastic(){
+        PetriNetTab tab = duplicateTab(new TAPNLens(lens.isTimed(), lens.isGame(), lens.isColored(), false), "-nonstochastic");
+        TabTransformer.removeDistributionInformation(tab);
+        TabTransformer.convertQueriesToOrFromSmc(tab.queries());
+        guiFrameControllerActions.ifPresent(o -> o.openTab(tab));
+    }
+
     public void createNewAndUnfoldColor(boolean partition, boolean computeColorFixpoint, boolean useSymmetricVars){
         TabTransformer.unfoldTab(this, partition, computeColorFixpoint, useSymmetricVars);
     }
@@ -1207,7 +1217,7 @@ public void changeTimeFeature(boolean isTime) {
                     createNewAndConvertUntimed();
                 }
             } else {
-                PetriNetTab tab = duplicateTab(new TAPNLens(true, lens.isGame(), lens.isColored()), "-timed");
+                PetriNetTab tab = duplicateTab(new TAPNLens(true, lens.isGame(), lens.isColored(), lens.isStochastic()), "-timed");
                 guiFrameControllerActions.ifPresent(o -> o.openTab(tab));
             }
             updateFeatureText();
@@ -1229,7 +1239,7 @@ public void changeGameFeature(boolean isGame) {
                     createNewAndConvertNonGame();
                 }
             } else {
-                PetriNetTab tab = duplicateTab(new TAPNLens(lens.isTimed(), true, lens.isColored()), "-game");
+                PetriNetTab tab = duplicateTab(new TAPNLens(lens.isTimed(), true, lens.isColored(), lens.isStochastic()), "-game");
                 guiFrameControllerActions.ifPresent(o -> o.openTab(tab));
             }
             updateFeatureText();
@@ -1253,6 +1263,25 @@ public void changeColorFeature(boolean isColor) {
         }
     }
 
+    @Override
+    public void changeStochasticFeature(boolean isStochastic) {
+        if(isStochastic != lens.isStochastic()) {
+            if (!isStochastic) {
+                String removeStochasticWarning = "The net contains distribution informations, which will be removed. Do you still wish to make to remove the stochastic semantics ?";
+                int choice = JOptionPane.showOptionDialog(TAPAALGUI.getApp(), removeStochasticWarning, "Remove stochastic information",
+                    JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, null, 0);
+                if (choice == 0) {
+                    createNewAndConvertNonStochastic();
+                }
+            } else {
+                PetriNetTab tab = duplicateTab(new TAPNLens(lens.isTimed(), lens.isGame(), lens.isColored(), true), "-stochastic");
+                TabTransformer.convertQueriesToOrFromSmc(tab.queries());
+                guiFrameControllerActions.ifPresent(o -> o.openTab(tab));
+            }
+            updateFeatureText();
+        }
+    }
+
     @Override
     public Map<PetriNetObject, Boolean> showNames(boolean showNames, boolean placeNames, boolean selectedComponent) {
         Map<PetriNetObject, Boolean> map = new HashMap<>();
@@ -1827,7 +1856,7 @@ public boolean isAlreadyFitToScreen() {
         return alreadyFitToScreen;
     }
 
-    @Override 
+    @Override
     public void fitToScreen() {
         final int margin = 50;
 
@@ -1837,31 +1866,31 @@ public void fitToScreen() {
             if (!petriNetObjects.iterator().hasNext()) {
                 return;
             }
-    
+
             int smallestX = Integer.MAX_VALUE;
             int smallestY = Integer.MAX_VALUE;
             int largestX = Integer.MIN_VALUE;
             int largestY = Integer.MIN_VALUE;
-    
+
             JViewport viewport = (JViewport)drawingSurface().getParent();
             for (PetriNetObject pno : currentTemplate().guiModel().getPetriNetObjects()) {
                 if (pno instanceof PlaceTransitionObject) {
                     if (pno.getOriginalX() < smallestX) {
                         smallestX = pno.getOriginalX();
                     }
-    
+
                     if (pno.getOriginalY() < smallestY) {
                         smallestY = pno.getOriginalY();
                     }
-    
+
                     if (pno.getOriginalX() + pno.getWidth() > largestX) {
                         largestX = pno.getOriginalX() + pno.getWidth();
                     }
-    
+
                     if (pno.getOriginalY() + pno.getHeight() > largestY) {
                         largestY = pno.getOriginalY() + pno.getHeight();
                     }
-    
+
                     if (pno instanceof Transition) {
                         Transition t = (Transition) pno;
                         for (Arc arc : t.getPreset()) {
@@ -1869,35 +1898,35 @@ public void fitToScreen() {
                                 if (point.getOriginalX() < smallestX) {
                                     smallestX = point.getOriginalX();
                                 }
-    
+
                                 if (point.getOriginalY() < smallestY) {
                                     smallestY = point.getOriginalY();
                                 }
-    
+
                                 if (point.getOriginalX() > largestX) {
                                     largestX = point.getOriginalX();
                                 }
-    
+
                                 if (point.getOriginalY() > largestY) {
                                     largestY = point.getOriginalY();
                                 }
                             }
                         }
-    
+
                         for (Arc arc : t.getPostset()) {
                             for (ArcPathPoint point : arc.getArcPath().getArcPathPoints()) {
                                 if (point.getOriginalX() < smallestX) {
                                     smallestX = point.getOriginalX();
                                 }
-    
+
                                 if (point.getOriginalY() < smallestY) {
                                     smallestY = point.getOriginalY();
                                 }
-    
+
                                 if (point.getOriginalX() > largestX) {
                                     largestX = point.getOriginalX();
                                 }
-    
+
                                 if (point.getOriginalY() > largestY) {
                                     largestY = point.getOriginalY();
                                 }
@@ -1912,7 +1941,7 @@ public void fitToScreen() {
 
             largestX += margin;
             largestY += margin;
-            
+
             int width = largestX - smallestX;
             int height = largestY - smallestY;
             double xZoomFactor = (double) viewport.getWidth() / width;
@@ -1921,7 +1950,7 @@ public void fitToScreen() {
             double zoomPercent = Math.min(xZoomFactor, yZoomFactor) * 100;
 
             double currentZoomPercent = drawingSurface().getZoomController().getPercent();
-            
+
             final double zoomConvergence = 1;
             if (Math.abs(currentZoomPercent - zoomPercent) < zoomConvergence) {
                 int x = (int) (smallestX * zoomFactor) - margin;
@@ -1934,8 +1963,8 @@ public void fitToScreen() {
                 alreadyFitToScreen = true;
                 return;
             }
-            
-            app.ifPresent(e -> e.updateZoomSlider((int)zoomPercent)); 
+
+            app.ifPresent(e -> e.updateZoomSlider((int)zoomPercent));
         }
     }
 
@@ -2039,7 +2068,7 @@ public void decreaseSpacing() {
 		getUndoManager().addNewEdit(new ChangeSpacingEditCommand(factor, this));
 	}
 
-	public void changeSpacing(double factor) { 
+	public void changeSpacing(double factor) {
         if (factor < 1) {
             Quadtree quadtree = new Quadtree();
             final int minimumDistance = 45;
@@ -2064,7 +2093,7 @@ public void changeSpacing(double factor) {
 
                 int newCenterX = (int)(center.getX() * factor);
                 int newCenterY = (int)(center.getY() * factor);
-       
+
 				pno.setCenter(newCenterX, newCenterY);
                 locations.put(pno, new Point(newCenterX, newCenterY));
 
@@ -2081,7 +2110,7 @@ public void changeSpacing(double factor) {
                                 newY += offsetY;
                             }
 
-                            point.setPointLocation(newX, newY);   
+                            point.setPointLocation(newX, newY);
 						}
 					}
 
@@ -2099,7 +2128,7 @@ public void changeSpacing(double factor) {
 			} else {
                 int newX = (int)(obj.getLocation().x * factor);
                 int newY = (int)(obj.getLocation().y * factor);
-              
+
 				obj.setLocation(newX, newY);
 			}
 		}
@@ -2565,7 +2594,7 @@ public void updateZoom() {
     }
 
     public void updateFeatureText() {
-        boolean[] features = {lens.isTimed(), lens.isGame(), lens.isColored()};
+        boolean[] features = {lens.isTimed(), lens.isGame(), lens.isColored(), lens.isStochastic()};
         app.ifPresent(o->o.setFeatureInfoText(features));
     }
 
@@ -2575,6 +2604,9 @@ public TAPNLens getLens() {
 
     private void convertToUntimedTab(PetriNetTab tab) {
         TabTransformer.removeTimingInformation(tab);
+        if(lens.isStochastic()) {
+            TabTransformer.removeDistributionInformation(tab);
+        }
     }
 
     static final class CanvasTransportarcDrawController extends AbstractCanvasArcDrawController {
diff --git a/src/main/java/pipe/gui/petrinet/animation/AnimationControlSidePanel.java b/src/main/java/pipe/gui/petrinet/animation/AnimationControlSidePanel.java
index 3d7bf7386..95b90ba24 100644
--- a/src/main/java/pipe/gui/petrinet/animation/AnimationControlSidePanel.java
+++ b/src/main/java/pipe/gui/petrinet/animation/AnimationControlSidePanel.java
@@ -8,7 +8,6 @@
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.Map;
 import java.util.Vector;
 import java.util.regex.Pattern;
@@ -18,7 +17,6 @@
 import javax.swing.text.AbstractDocument;
 
 import dk.aau.cs.model.tapn.simulation.TAPNNetworkTrace;
-import dk.aau.cs.model.tapn.simulation.TimedArcPetriNetTrace;
 
 import net.tapaal.gui.petrinet.TAPNLens;
 import dk.aau.cs.util.Require;
@@ -84,8 +82,6 @@ public AnimationControlSidePanel(Animator animator, TAPNLens lens) {
         traceBox.setPreferredSize(new Dimension(100, 27));
         traceBox.setToolTipText(TRACEBOX_DROPDOWN_TOOL_TIP);
         showTraceBox(false);
-        animationToolBar.add(Box.createHorizontalStrut(10));
-        animationToolBar.add(traceBox);
 
         GridBagConstraints c = new GridBagConstraints();
 		c.fill = GridBagConstraints.HORIZONTAL;
@@ -122,7 +118,6 @@ public AnimationControlSidePanel(Animator animator, TAPNLens lens) {
 
     public void updateTraceBox(Map<String, TAPNNetworkTrace> traceMap) {
         Vector<Object> tracesVector = new Vector<>();
-
         for (var entry : traceMap.entrySet()) {
             tracesVector.add(entry.getKey());
         }
@@ -137,12 +132,25 @@ public void updateTraceBox(Map<String, TAPNNetworkTrace> traceMap) {
 
         showTraceBox(true);
 
+        if (timedelayPanel.isVisible()) {
+            GridBagConstraints gbc = new GridBagConstraints();
+            gbc.fill = GridBagConstraints.HORIZONTAL;
+            gbc.weightx = 0.5;
+            gbc.gridx = 0;
+            gbc.gridy = 3;
+            gbc.insets = new Insets(10, 0, 0, 0); 
+            add(traceBox, gbc);
+        } else {
+            animationToolBar.add(Box.createHorizontalStrut(10));
+            animationToolBar.add(traceBox);
+        }
+
         remove(animationToolBar);
         GridBagConstraints c = new GridBagConstraints();
         c.fill = GridBagConstraints.HORIZONTAL;
         c.weightx = 0.5;
         c.gridx = 0;
-        c.gridy = 0;
+        c.gridy = 2;
         add(animationToolBar, c);
     }
 
diff --git a/src/main/java/pipe/gui/petrinet/animation/Animator.java b/src/main/java/pipe/gui/petrinet/animation/Animator.java
index bbba92977..7ac8a3a12 100644
--- a/src/main/java/pipe/gui/petrinet/animation/Animator.java
+++ b/src/main/java/pipe/gui/petrinet/animation/Animator.java
@@ -157,6 +157,7 @@ private void setTimedTrace(TAPNNetworkTrace trace) {
      * Checks if the number of tokens removed from a place is as expected, otherwise shows an error message
      */
     private void checkTokensRemoved(NetworkMarking previousMarking, TimedTransition previousTransition) {
+        if (tab.getLens().isStochastic()) return;
         for (TimedInputArc inputArc : previousTransition.getInputArcs()) {
             int tokensBefore = previousMarking.getTokensFor(inputArc.source()).size();
             
@@ -346,7 +347,6 @@ public void stepForward() {
      * Make the selected transition in the animation box blink, based on the
      * list element label
      */
-
     public void blinkSelected(String label){
         if(label.contains(".")){
             label = label.split("\\.")[1];
diff --git a/src/main/java/pipe/gui/petrinet/editor/PlaceEditorPanel.java b/src/main/java/pipe/gui/petrinet/editor/PlaceEditorPanel.java
index dadc19cc5..dafa9a938 100644
--- a/src/main/java/pipe/gui/petrinet/editor/PlaceEditorPanel.java
+++ b/src/main/java/pipe/gui/petrinet/editor/PlaceEditorPanel.java
@@ -2,7 +2,6 @@
 
 import dk.aau.cs.model.CPN.ExpressionSupport.ExprStringPosition;
 import net.tapaal.gui.petrinet.Context;
-//import java.awt.Color;
 import java.awt.event.ItemEvent;
 import java.util.*;
 
@@ -48,8 +47,6 @@
 
 import static net.tapaal.swinghelpers.GridBagHelper.Fill.HORIZONTAL;
 
-//import dk.aau.cs.gui.components.ColorComboBoxRenderer;
-
 public class PlaceEditorPanel extends JPanel {
 
 	private final JRootPane rootPane;
diff --git a/src/main/java/pipe/gui/petrinet/editor/TAPNTransitionEditor.java b/src/main/java/pipe/gui/petrinet/editor/TAPNTransitionEditor.java
index 94b8400d1..b6940d969 100644
--- a/src/main/java/pipe/gui/petrinet/editor/TAPNTransitionEditor.java
+++ b/src/main/java/pipe/gui/petrinet/editor/TAPNTransitionEditor.java
@@ -9,8 +9,14 @@
 import java.util.Vector;
 
 import javax.swing.*;
-import javax.swing.event.CaretListener;
-
+import javax.swing.event.*;
+
+import dk.aau.cs.model.tapn.*;
+import dk.aau.cs.model.tapn.simulation.FiringMode;
+import dk.aau.cs.model.tapn.simulation.OldestFiringMode;
+import dk.aau.cs.model.tapn.simulation.RandomFiringMode;
+import dk.aau.cs.model.tapn.simulation.YoungestFiringMode;
+import net.tapaal.gui.petrinet.editor.DistributionPanel;
 import net.tapaal.gui.petrinet.undo.*;
 import net.tapaal.swinghelpers.GridBagHelper;
 import net.tapaal.swinghelpers.SwingHelper;
@@ -19,14 +25,8 @@
 import pipe.gui.petrinet.graphicElements.PetriNetObject;
 import pipe.gui.petrinet.graphicElements.tapn.TimedTransitionComponent;
 import net.tapaal.gui.petrinet.Context;
-import dk.aau.cs.model.tapn.Bound;
-import dk.aau.cs.model.tapn.SharedTransition;
-import dk.aau.cs.model.tapn.TimedInhibitorArc;
-import dk.aau.cs.model.tapn.TimedInputArc;
-import dk.aau.cs.model.tapn.TimedOutputArc;
-import dk.aau.cs.model.tapn.TimedTransition;
-import dk.aau.cs.model.tapn.TransportArc;
 import dk.aau.cs.util.RequireException;
+import pipe.gui.swingcomponents.EscapableDialog;
 
 import static net.tapaal.swinghelpers.GridBagHelper.Fill;
 import static net.tapaal.swinghelpers.GridBagHelper.Anchor;
@@ -36,6 +36,7 @@ public class TAPNTransitionEditor extends JPanel {
 	private static final String untimed_preset_warning = "Incoming arcs to urgent transitions must have the interval [0,\u221e).";
 	private static final String transport_destination_invariant_warning = "Transport arcs going through urgent transitions cannot have an invariant at the destination.";
 	private final TimedTransitionComponent transition;
+    private final EscapableDialog dialog;
 	private final JRootPane rootPane;
 	private final Context context;
 	private JScrollPane scrollPane;
@@ -46,8 +47,9 @@ public class TAPNTransitionEditor extends JPanel {
 	private final int maxNumberOfTransitionsToShowAtOnce = 20;
 	boolean doNewEdit = true;
 
-	public TAPNTransitionEditor(JRootPane _rootPane, TimedTransitionComponent _transition, Context context) {
-		rootPane = _rootPane;
+	public TAPNTransitionEditor(EscapableDialog _dialog, TimedTransitionComponent _transition, Context context) {
+		dialog = _dialog;
+        rootPane = _dialog.getRootPane();
 		transition = _transition;
 		this.context = context;
 		initComponents();
@@ -62,6 +64,7 @@ private void hideIrrelevantInformation(){
 	    if(!transition.isColored() || !coloredTransitionGuardPanel.showGuardPanel()){
 	        coloredTransitionGuardPanel.setVisible(false);
         }
+        distributionPanel.setVisible((!urgentCheckBox.isSelected()) && transition.isStochastic());
     }
 
 	private void initComponents() {
@@ -84,6 +87,21 @@ private void initComponents() {
 		uncontrollableCheckBox = new JCheckBox("Uncontrollable");
 		attributesCheckBox = new JCheckBox("Show transition name");
 
+        weightField = new JTextField();
+        infiniteWeight = new JCheckBox("∞");
+        useConstantWeight = new JCheckBox("Use constant");
+        ArrayList<String> constants = new ArrayList<>();
+        for(Constant c : context.network().constants()) {
+            constants.add(c.name());
+        }
+        constantsComboBox = new JComboBox<>(new DefaultComboBoxModel<>(constants.toArray(new String[0])));
+        useConstantWeight.setEnabled(!constants.isEmpty());
+        useConstantWeight.addActionListener(act -> displayWeight(parseWeight()));
+		
+		firingModeComboBox = new JComboBox<>(new FiringMode[]{new OldestFiringMode(), new YoungestFiringMode(), new RandomFiringMode()});
+        firingModeComboBox.setToolTipText("Determines what tokens are consumed during random runs");
+
+        distributionPanel = new DistributionPanel(transition, dialog);
 
 		sharedTransitionsComboBox = new WidthAdjustingComboBox<>(maxNumberOfTransitionsToShowAtOnce);
 		SwingHelper.setPreferredWidth(sharedTransitionsComboBox,290);
@@ -93,10 +111,14 @@ private void initComponents() {
                 ((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).setUrgent(urgentCheckBox.isSelected());
                 ((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).setUncontrollable(uncontrollableCheckBox.isSelected());
                 ((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).setGuard(coloredTransitionGuardPanel.getExpression());
+                ((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).setDistribution(distributionPanel.parseDistribution());
+                ((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).setWeight(parseWeight());
             }else{
                 urgentCheckBox.setSelected(((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).isUrgent());
                 uncontrollableCheckBox.setSelected(((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).isUncontrollable());
                 coloredTransitionGuardPanel.initExpr(((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).getGuard());
+                distributionPanel.displayDistributionFields(((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).getDistribution());
+                displayWeight(((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).getWeight());
             }
 		});
 
@@ -159,11 +181,16 @@ public void focusLost(java.awt.event.FocusEvent evt) {
 		
 		gridBagConstraints = GridBagHelper.as(2, 2, Anchor.WEST, new Insets(3, 3, 3, 3));
 		transitionEditorPanel.add(urgentCheckBox, gridBagConstraints);
+        if(transition.isStochastic()) {
+            urgentCheckBox.setToolTipText("Note: for SMC, it is recommended to prefer setting a constant(0) distribution instead of using urgent transitions");
+        }
 		
 		urgentCheckBox.addActionListener(e -> {
 			if(!isUrgencyOK()){
 				urgentCheckBox.setSelected(false);
 			}
+            distributionPanel.setVisible((!urgentCheckBox.isSelected()) && transition.isStochastic());
+            dialog.pack();
 		});
 
         gridBagConstraints = new java.awt.GridBagConstraints();
@@ -183,11 +210,74 @@ public void actionPerformed(ActionEvent arg0) {
         }
 	
 		rotationLabel.setText("Rotate:");
-		gridBagConstraints = GridBagHelper.as(0,2, Anchor.NORTH, new Insets(3, 3, 3, 3));
+		gridBagConstraints = GridBagHelper.as(0,2, Anchor.EAST, new Insets(3, 3, 3, 3));
 		transitionEditorPanel.add(rotationLabel, gridBagConstraints);
 
-		gridBagConstraints = GridBagHelper.as(1,2, Anchor.NORTHWEST, new Insets(3, 3, 3, 3));
-		transitionEditorPanel.add(rotationComboBox, gridBagConstraints);
+        JPanel comboBoxAndCheckBoxPanel = new JPanel(new GridBagLayout());
+        gridBagConstraints = GridBagHelper.as(0, 0, Anchor.WEST, new Insets(3, 3, 3, 3));
+        comboBoxAndCheckBoxPanel.add(rotationComboBox, gridBagConstraints);
+        gridBagConstraints = GridBagHelper.as(1, 0, Anchor.WEST, new Insets(3, 3, 3, 3));
+        comboBoxAndCheckBoxPanel.add(attributesCheckBox, gridBagConstraints);
+
+		gridBagConstraints = GridBagHelper.as(1,2, Anchor.WEST, new Insets(3, 3, 3, 3));
+		transitionEditorPanel.add(comboBoxAndCheckBoxPanel, gridBagConstraints);
+
+        if(context.tabContent().getLens().isStochastic()) {
+            String weightToolTip = "Probability mass of the transition in the event of a firing date collision";
+            JLabel weightLabel = new JLabel("Weight:");
+            weightLabel.setToolTipText(weightToolTip);
+            weightField.setToolTipText(weightToolTip);
+            infiniteWeight.setToolTipText("Selecting weight as an infinity gives an absolute priority of the transition firing in case of several transitions scheduled at the same time");
+            infiniteWeight.addActionListener(act -> weightField.setEnabled(!infiniteWeight.isSelected()));
+
+			String firingModeTooltip = "The firing mode of the transition";
+			JLabel firingModeLabel = new JLabel("Firing mode:");
+            firingModeLabel.setToolTipText(firingModeTooltip);
+
+            gridBagConstraints = GridBagHelper.as(0, 0, Anchor.EAST, new Insets(3, 3, 3, 3));
+            JPanel firingModePanel = new JPanel(new GridBagLayout());
+
+            gridBagConstraints = GridBagHelper.as(0, 0, Anchor.EAST, new Insets(3, 3, 3, 3));
+            firingModePanel.add(firingModeLabel, gridBagConstraints);
+            
+            gridBagConstraints = GridBagHelper.as(1, 0, Anchor.WEST, new Insets(3, 3, 3, 3));
+            gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
+            gridBagConstraints.weightx = 0.5;
+            firingModePanel.add(firingModeComboBox, gridBagConstraints);
+
+            gridBagConstraints = GridBagHelper.as(2, 0, Anchor.EAST, new Insets(3, 3, 3, 3));
+            gridBagConstraints.fill = GridBagConstraints.NONE;
+            gridBagConstraints.weightx = 0;
+            firingModePanel.add(weightLabel, gridBagConstraints);
+
+            gridBagConstraints = GridBagHelper.as(3, 0, Anchor.WEST, new Insets(3, 3, 3, 0));
+            gridBagConstraints.fill = GridBagConstraints.BOTH;
+            gridBagConstraints.weightx = 1.0;
+            firingModePanel.add(weightField, gridBagConstraints);
+
+            gridBagConstraints = GridBagHelper.as(4, 0, Anchor.WEST, new Insets(3, 3, 3, 0));
+            gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
+            gridBagConstraints.weightx = 1.0;
+            firingModePanel.add(constantsComboBox, gridBagConstraints);
+
+            gridBagConstraints = GridBagHelper.as(5, 0, Anchor.WEST, new Insets(3, 3, 3, 3));
+            gridBagConstraints.fill = GridBagConstraints.NONE;
+            gridBagConstraints.weightx = 0;
+            firingModePanel.add(infiniteWeight, gridBagConstraints);
+
+            gridBagConstraints = GridBagHelper.as(6, 0, Anchor.WEST, new Insets(3, 3, 3, 3));
+            gridBagConstraints.fill = GridBagConstraints.NONE;
+            gridBagConstraints.weightx = 0;
+            firingModePanel.add(useConstantWeight, gridBagConstraints);
+
+            gridBagConstraints = GridBagHelper.as(0, 4, Fill.HORIZONTAL, new Insets(3, 3, 3, 3));
+            gridBagConstraints.gridwidth = 10;
+            distributionPanel.add(firingModePanel, gridBagConstraints);
+        }
+        
+        gridBagConstraints = GridBagHelper.as(0, 3, Fill.HORIZONTAL, new Insets(3, 3, 3, 3));
+        gridBagConstraints.gridwidth = 4;
+        transitionEditorPanel.add(distributionPanel, gridBagConstraints);
 
 		gridBagConstraints = new GridBagConstraints();
 		gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
@@ -222,11 +312,6 @@ public void actionPerformed(ActionEvent arg0) {
 		gridBagConstraints = GridBagHelper.as(0,3, Anchor.EAST, new Insets(5, 0, 8, 3));
 		mainPanel.add(buttonPanel, gridBagConstraints);
 
-		attributesCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		attributesCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-		gridBagConstraints = GridBagHelper.as(1,3, Anchor.WEST, new Insets(3, 3, 3, 3));
-		transitionEditorPanel.add(attributesCheckBox, gridBagConstraints);
-
 		gridBagConstraints = GridBagHelper.as(0,1,Anchor.WEST, new Insets(3, 3, 3, 3));
 		gridBagConstraints.weightx = 1.0;
 		gridBagConstraints.weighty = 1.0;
@@ -267,6 +352,24 @@ private void setupInitialState(){
 		uncontrollableCheckBox.setSelected(transition.isUncontrollable());
 		coloredTransitionGuardPanel.initExpr(transition.getGuardExpression());
 
+        if(context.tabContent().getLens().isStochastic()) {
+            distributionPanel.displayDistribution();
+            displayWeight();
+
+			if (transition.underlyingTransition().getFiringMode() == null) {
+				firingModeComboBox.setSelectedIndex(0);
+			} else {
+				FiringMode firingMode = transition.underlyingTransition().getFiringMode();
+
+				for (int i = 0; i < firingModeComboBox.getItemCount(); i++) {
+					if (firingModeComboBox.getItemAt(i).toString().equals(firingMode.toString())) {
+						firingModeComboBox.setSelectedIndex(i);
+						break;
+					}
+				}
+			}
+        }
+
 		if(transition.underlyingTransition().isShared()){
 			switchToNameDropDown();
 			sharedCheckBox.setSelected(true);
@@ -306,6 +409,9 @@ protected void switchToNameTextField() {
 		gbc.fill = GridBagConstraints.BOTH;
 		urgentCheckBox.setSelected(transition.isUrgent());
 		uncontrollableCheckBox.setSelected(transition.isUncontrollable());
+        distributionPanel.displayDistributionFields(transition.underlyingTransition().getDistribution());
+        displayWeight(transition.underlyingTransition().getWeight());
+        uncontrollableCheckBox.setSelected(transition.isUncontrollable());
 		transitionEditorPanel.add(nameTextField, gbc);
 		transitionEditorPanel.validate();
 		transitionEditorPanel.repaint();
@@ -321,10 +427,14 @@ protected void switchToNameDropDown() {
             ((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).setUrgent(urgentCheckBox.isSelected());
             ((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).setUncontrollable(uncontrollableCheckBox.isSelected());
             ((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).setGuard(coloredTransitionGuardPanel.getExpression());
+            ((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).setDistribution(distributionPanel.parseDistribution());
+            ((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).setWeight(parseWeight());
         }else{
             urgentCheckBox.setSelected(((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).isUrgent());
             uncontrollableCheckBox.setSelected(((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).isUncontrollable());
             coloredTransitionGuardPanel.initExpr(((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).getGuard());
+            distributionPanel.displayDistributionFields(((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).getDistribution());
+            displayWeight(((SharedTransition)sharedTransitionsComboBox.getSelectedItem()).getWeight());
 		}
 		transitionEditorPanel.validate();
 		transitionEditorPanel.repaint();
@@ -411,11 +521,11 @@ private boolean okButtonHandler(java.awt.event.ActionEvent evt) {
 			try{
 				String oldName = transition.underlyingTransition().name();
 				if (!oldName.equals(newName)) {
-				transition.underlyingTransition().setName(newName);
-				Command renameCommand = new RenameTimedTransitionCommand(context.tabContent(), transition.underlyingTransition(), oldName, newName);
-				context.undoManager().addEdit(renameCommand);
-				// set name
-				renameCommand.redo();
+                    transition.underlyingTransition().setName(newName);
+                    Command renameCommand = new RenameTimedTransitionCommand(context.tabContent(), transition.underlyingTransition(), oldName, newName);
+                    context.undoManager().addEdit(renameCommand);
+                    // set name
+                    renameCommand.redo();
 				}
 			}catch(RequireException e){
 				context.undoManager().undo(); 
@@ -453,6 +563,8 @@ private boolean okButtonHandler(java.awt.event.ActionEvent evt) {
 				}
 				transition.setUrgent(urgentCheckBox.isSelected());
 				transition.setUncontrollable(uncontrollableCheckBox.isSelected());
+                transition.underlyingTransition().setDistribution(distributionPanel.parseDistribution());
+                transition.underlyingTransition().setWeight(parseWeight());
 			}
 		}
 		
@@ -465,6 +577,26 @@ private boolean okButtonHandler(java.awt.event.ActionEvent evt) {
             transition.setUncontrollable(uncontrollableCheckBox.isSelected());
         }
 
+        SMCDistribution distribution = distributionPanel.parseDistribution();
+        if(!transition.underlyingTransition().getDistribution().equals(distribution)) {
+            context.undoManager().addEdit(new ChangeTransitionDistributionCommand(transition, transition.underlyingTransition(),distribution));
+            transition.underlyingTransition().setDistribution(distribution);
+        }
+
+        Probability weight = parseWeight();
+        if (!transition.underlyingTransition().getWeight().equals(weight)) {
+            context.undoManager().addEdit(new ChangeProbabilityWeightCommand(transition, transition.underlyingTransition(), weight));
+            transition.underlyingTransition().setWeight(weight);
+        }
+
+        FiringMode firingMode = (FiringMode)firingModeComboBox.getSelectedItem();
+        if (!transition.underlyingTransition().getFiringMode().equals(firingMode)) {
+            context.undoManager().addEdit(new ChangeFiringModeCommand(transition.underlyingTransition(), firingMode));
+            transition.underlyingTransition().setFiringMode(firingMode);
+        }
+
+        context.network().buildConstraints();
+
 		int rotationIndex = rotationComboBox.getSelectedIndex();
 		if (rotationIndex > 0) {
 			int angle = 0;
@@ -519,6 +651,55 @@ private void cancelButtonHandler(java.awt.event.ActionEvent evt) {
 		exit();
 	}
 
+    private Probability parseWeight() {
+        if(useConstantWeight.isSelected()) {
+            Constant constant = context.network().getConstant((String) constantsComboBox.getSelectedItem());
+            return new ConstantProbability(constant);
+        }
+        if(infiniteWeight.isSelected()) {
+            return new DoubleProbability(Double.POSITIVE_INFINITY);
+        }
+        try {
+            return new DoubleProbability(Double.parseDouble(weightField.getText()));
+        } catch(NumberFormatException e) {
+            return new DoubleProbability(1.0);
+        }
+    }
+
+    private void displayWeight() {
+        displayWeight(transition.underlyingTransition().getWeight());
+    }
+
+    private void displayWeight(Probability weight) {
+        if(weight instanceof ConstantProbability) {
+            displayConstantWeight(weight);
+        } else {
+            displayDoubleWeight(weight);
+        }
+    }
+
+    private void displayConstantWeight(Probability weight) {
+        weightField.setVisible(false);
+        infiniteWeight.setEnabled(false);
+        constantsComboBox.setVisible(true);
+        useConstantWeight.setSelected(true);
+        ConstantProbability constWeight = (ConstantProbability) weight;
+        constantsComboBox.setSelectedItem(constWeight.constant().name());
+    }
+
+    private void displayDoubleWeight(Probability weight) {
+        weightField.setVisible(true);
+        infiniteWeight.setEnabled(true);
+        constantsComboBox.setVisible(false);
+        useConstantWeight.setSelected(false);
+        if(Double.isInfinite(weight.value())) {
+            infiniteWeight.setSelected(true);
+        } else {
+            weightField.setText(String.valueOf(weight.value()));
+        }
+        weightField.setEnabled(!infiniteWeight.isSelected());
+    }
+
 	private JPanel buttonPanel;
 	private JButton cancelButton;
 	private JLabel nameLabel;
@@ -534,6 +715,14 @@ private void cancelButtonHandler(java.awt.event.ActionEvent evt) {
 	private javax.swing.JCheckBox urgentCheckBox;
     private Vector<SharedTransition> sharedTransitions;
 
+    private JTextField weightField;
+    private JCheckBox infiniteWeight;
+    private JCheckBox useConstantWeight;
+    private JComboBox<String> constantsComboBox;
+	private JComboBox<FiringMode> firingModeComboBox;
+
+    private DistributionPanel distributionPanel;
+
     private javax.swing.JCheckBox uncontrollableCheckBox;
 
 	private boolean makeNewShared = false;
diff --git a/src/main/java/pipe/gui/petrinet/graphicElements/PetriNetObject.java b/src/main/java/pipe/gui/petrinet/graphicElements/PetriNetObject.java
index f0fdc2f71..ee97fd591 100644
--- a/src/main/java/pipe/gui/petrinet/graphicElements/PetriNetObject.java
+++ b/src/main/java/pipe/gui/petrinet/graphicElements/PetriNetObject.java
@@ -245,6 +245,10 @@ public boolean isTimed(){
 	    return lens.isTimed();
     }
 
+    public boolean isStochastic() {
+        return lens.isStochastic();
+    }
+
     public void setLens(TAPNLens lens){
 	    this.lens = lens;
     }
diff --git a/src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedTransitionComponent.java b/src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedTransitionComponent.java
index 0937fc0dc..7607c461c 100644
--- a/src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedTransitionComponent.java
+++ b/src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedTransitionComponent.java
@@ -17,6 +17,7 @@
 
 import javax.swing.*;
 
+import dk.aau.cs.model.tapn.*;
 import net.tapaal.gui.petrinet.TAPNLens;
 import dk.aau.cs.model.CPN.Expressions.GuardExpression;
 import pipe.gui.TAPAALGUI;
@@ -26,9 +27,6 @@
 import pipe.gui.petrinet.editor.TAPNTransitionEditor;
 import net.tapaal.gui.petrinet.Context;
 import net.tapaal.gui.petrinet.undo.Command;
-import dk.aau.cs.model.tapn.TimeInterval;
-import dk.aau.cs.model.tapn.TimedArcPetriNet;
-import dk.aau.cs.model.tapn.TimedTransition;
 import dk.aau.cs.model.tapn.event.TimedTransitionEvent;
 import dk.aau.cs.model.tapn.event.TimedTransitionListener;
 
@@ -128,7 +126,7 @@ public void showEditor() {
 		contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.PAGE_AXIS));
 
 		// 2 Add Place editor
-		contentPane.add(new TAPNTransitionEditor(guiDialog.getRootPane(), this, new Context(TAPAALGUI.getCurrentTab())));
+		contentPane.add(new TAPNTransitionEditor(guiDialog, this, new Context(TAPAALGUI.getCurrentTab())));
 
 		guiDialog.setResizable(true);
 
@@ -208,19 +206,23 @@ public boolean hasUntimedPreset(){
 	
 	@Override
 	public void update(boolean displayConstantNames) {
+        getNameLabel().setText("");
 		if(transition != null) {
 			getNameLabel().setName(transition.name());
 			getNameLabel().setVisible(attributesVisible);
 			getNameLabel().zoomUpdate(getZoom());
+            if(lens.isStochastic()) {
+                getNameLabel().setText("\n" + underlyingTransition().getDistribution().summary() +
+                    (   underlyingTransition().getWeight() instanceof ConstantProbability ||
+                        underlyingTransition().getWeight().value() != 1 ?
+                        "\nW=" + underlyingTransition().getWeight().toString() : ""
+                    )
+                );
+            }
 			if(underlyingTransition().getGuard() != null && lens.isColored()){
-                pnName.setText("");
                 super.update(displayConstantNames);
                 pnName.setText(pnName.getText() + "\n" + buildGuardString(this.underlyingTransition().getGuard().toString()));
-            } else {
-                getNameLabel().setText("");
             }
-		} else {
-			getNameLabel().setText("");
 		}
 
 		repaint();
diff --git a/src/main/javacc/dk/aau/cs/TCTL/SMCParsing/TAPAALSMCQueryParsing.jj b/src/main/javacc/dk/aau/cs/TCTL/SMCParsing/TAPAALSMCQueryParsing.jj
new file mode 100644
index 000000000..1f0b6efbf
--- /dev/null
+++ b/src/main/javacc/dk/aau/cs/TCTL/SMCParsing/TAPAALSMCQueryParsing.jj
@@ -0,0 +1,273 @@
+options {
+    LOOKAHEAD = 1;
+    CHOICE_AMBIGUITY_CHECK = 2;
+    OTHER_AMBIGUITY_CHECK = 1;
+    STATIC = false;
+    DEBUG_PARSER = false;
+    DEBUG_LOOKAHEAD = false;
+    DEBUG_TOKEN_MANAGER = false;
+    ERROR_REPORTING = true;
+    JAVA_UNICODE_ESCAPE = false;
+    UNICODE_INPUT = false;
+    IGNORE_CASE = false;
+    USER_TOKEN_MANAGER = false;
+    USER_CHAR_STREAM = false;
+    BUILD_PARSER = true;
+    BUILD_TOKEN_MANAGER = true;
+    SANITY_CHECK = true;
+    }
+
+    PARSER_BEGIN(TAPAALSMCQueryParser)
+
+    package dk.aau.cs.TCTL.SMCParsing;
+
+import java.io.StringReader;
+import java.util.ArrayList;
+
+import dk.aau.cs.TCTL.*;
+
+public class TAPAALSMCQueryParser {
+
+    private static final String ERROR_PARSING_QUERY_MESSAGE = "TAPAAL countered an error trying to parse the query";
+
+    public static TCTLAbstractPathProperty parse(String query) throws ParseException {
+        TAPAALSMCQueryParser parser = new TAPAALSMCQueryParser(new StringReader(query));
+        return parser.Start();
+    }
+}
+
+    PARSER_END(TAPAALSMCQueryParser)
+
+TOKEN :
+    {
+<TRUE: "true" | "TRUE">
+    |
+<FALSE: "false" | "FALSE">
+    }
+
+    TOKEN :
+    {
+<F: "F">
+    |
+<G: "G">
+    }
+
+    TOKEN :
+    {
+<OR: "or" | "||">
+    |
+<AND: "and" | "&&">
+    |
+<NOT: "not" | "!">
+    }
+
+    TOKEN :
+    {
+<PLUS: "+">
+    |
+<MINUS: "-">
+    |
+<MULT: "*">
+    }
+
+    TOKEN :
+    {
+< NUM: ("-")? ( ["0"-"9"] )+ >
+    |
+<IDENT: ["a"-"z","A"-"Z","_"] ( ["a"-"z","A"-"Z","_","0"-"9"] )* >
+    }
+
+    TOKEN :
+    {
+<OP: "<" | "!=" | "<=" | ">" | "=" | "==" | ">=" | ">" >
+    }
+
+    SKIP :
+    {
+    " "
+    | "\t"
+    | "\n"
+    | "\r"
+    }
+
+/** Root production. */
+TCTLAbstractPathProperty Start() :
+{
+        TCTLAbstractPathProperty child = null;
+}
+{
+   child = QuantifierExpr() <EOF> {return child; }
+}
+
+TCTLAbstractPathProperty ParanthesesExpr() :
+{
+    TCTLAbstractPathProperty pathChild = null;
+    TCTLAbstractStateProperty stateChild = null;
+}
+{
+    "(" pathChild = QuantifierExpr() ")" {return pathChild;}
+    | stateChild = OrExpr() {return new TCTLStateToPathConverter(stateChild); }
+}
+
+TCTLAbstractPathProperty QuantifierExpr() :
+{
+    TCTLAbstractStateProperty child = null;
+    TCTLAbstractStateProperty child2 = null;
+}
+{
+    <F> child = OrExpr() {return new LTLFNode(child); }
+    | <G> child = OrExpr() {return new LTLGNode(child); }
+}
+
+TCTLAbstractStateProperty OrExpr() :
+{
+    TCTLAbstractStateProperty currentChild;
+    ArrayList<TCTLAbstractStateProperty> disjunctions = new ArrayList<TCTLAbstractStateProperty>();
+}
+{
+    currentChild = AndExpr()
+    { disjunctions.add(currentChild); }
+    (
+    <OR> currentChild = AndExpr()
+    { disjunctions.add(currentChild); }
+    )*
+    { return disjunctions.size() == 1 ? currentChild : new TCTLOrListNode(disjunctions); }
+}
+
+TCTLAbstractStateProperty AndExpr() :
+{
+    TCTLAbstractStateProperty currentChild;
+    ArrayList<TCTLAbstractStateProperty> conjunctions = new ArrayList<TCTLAbstractStateProperty>();
+}
+{
+    currentChild = NotExpr()
+    { conjunctions.add(currentChild); }
+    (
+    <AND> currentChild = NotExpr()
+    { conjunctions.add(currentChild); }
+    )*
+    { return conjunctions.size() == 1 ? currentChild : new TCTLAndListNode(conjunctions); }
+}
+
+    TCTLAbstractStateProperty NotExpr() :
+    {
+    TCTLAbstractStateProperty child;
+    TCTLAbstractStateProperty child2 = null;
+    TCTLAbstractPathProperty childConverter;
+    }
+    {
+    <NOT> "(" child = OrExpr() ")" { return new TCTLNotNode(child); }
+    | child = Factor() { return child; }
+    | "(" childConverter = QuantifierExpr() ")" { return new TCTLPathToStateConverter(childConverter); }
+    }
+
+    TCTLAbstractStateProperty Factor() :
+    {
+    TCTLAbstractStateProperty thisProp;
+    Token temp = null;
+    Token transition;
+    }
+    {
+    (
+<TRUE> {thisProp = new TCTLTrueNode(); }
+    | <FALSE> {thisProp = new TCTLFalseNode(); }
+    | LOOKAHEAD(AtomicProposition())
+    thisProp = AtomicProposition()
+    | [ LOOKAHEAD(2) temp = <IDENT> "." ] transition = <IDENT> {
+    thisProp = new TCTLTransitionNode(temp == null ? "" : temp.image, transition.image); }
+    | "(" thisProp = OrExpr() ")"
+    | LOOKAHEAD(ParanthesesExpr()) {
+    thisProp = new TCTLPathToStateConverter(QuantifierExpr()); }
+    )
+    { return thisProp; }
+    }
+
+    TCTLAbstractStateProperty AtomicProposition() :
+    {
+    TCTLAbstractStateProperty left;
+    TCTLAbstractStateProperty right;
+    Token op;
+    }
+    {
+    (
+    left = AritmeticExpr() op = <OP> right = AritmeticExpr()
+    )
+    {
+    return new TCTLAtomicPropositionNode(left, op.image, right);
+    }
+    }
+
+    TCTLAbstractStateProperty AritmeticExpr() :
+    {
+    TCTLAbstractStateProperty currentChild;
+    ArrayList<TCTLAbstractStateProperty> terms = new ArrayList<TCTLAbstractStateProperty>();
+    Token op;
+    }
+    {
+    currentChild = AritmeticMinusExpr()
+    { terms.add(currentChild); }
+    (
+    op = <PLUS> currentChild = AritmeticMinusExpr()
+    {
+    terms.add(new AritmeticOperator(op.image));
+    terms.add(currentChild);
+    }
+    )*
+    { return terms.size() == 1 ? currentChild : new TCTLTermListNode(terms); }
+    }
+
+    TCTLAbstractStateProperty AritmeticMinusExpr() :
+    {
+    TCTLAbstractStateProperty currentChild;
+    ArrayList<TCTLAbstractStateProperty> terms = new ArrayList<TCTLAbstractStateProperty>();
+    Token op;
+    }
+    {
+    currentChild = AritmeticTerm()
+    { terms.add(currentChild); }
+    (
+    op = <MINUS> currentChild = AritmeticTerm()
+    {
+    terms.add(new AritmeticOperator(op.image));
+    terms.add(currentChild);
+    }
+    )*
+    { return terms.size() == 1 ? currentChild : new TCTLTermListNode(terms); }
+    }
+
+    TCTLAbstractStateProperty AritmeticTerm() :
+    {
+    TCTLAbstractStateProperty currentChild;
+    ArrayList<TCTLAbstractStateProperty> factors = new ArrayList<TCTLAbstractStateProperty>();
+    Token op;
+    }
+    {
+    currentChild = AritmeticFactor()
+    { factors.add(currentChild); }
+    (
+    op = <MULT> currentChild = AritmeticFactor()
+    {
+    factors.add(new AritmeticOperator(op.image));
+    factors.add(currentChild);
+    }
+    )*
+    { return factors.size() == 1 ? currentChild : new TCTLTermListNode(factors); }
+    }
+
+    TCTLAbstractStateProperty AritmeticFactor() :
+    {
+    TCTLAbstractStateProperty thisProp;
+    Token temp = null;
+    Token place;
+    Token op;
+    Token num;
+    }
+    {
+    (
+    [ LOOKAHEAD(2) temp = <IDENT> "." ] place = <IDENT> { thisProp = new TCTLPlaceNode(temp == null ? "" : temp.image, place.image); }
+    | num = <NUM> { thisProp = new TCTLConstNode(Integer.parseInt(num.image)); }
+    | "(" thisProp = AritmeticExpr() ")"
+    )
+
+    { return thisProp; }
+    }
diff --git a/src/main/resources/Example nets/euler-number.tapn b/src/main/resources/Example nets/euler-number.tapn
new file mode 100644
index 000000000..0b02bd5fb
--- /dev/null
+++ b/src/main/resources/Example nets/euler-number.tapn	
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<pnml xmlns="http://www.informatik.hu-berlin.de/top/pnml/ptNetb">
+  <declaration>
+    <structure>
+      <declarations>
+        <namedsort id="dot" name="dot">
+          <dot/>
+        </namedsort>
+      </declarations>
+    </structure>
+  </declaration>
+  <net active="true" id="Euler" type="P/T net">
+    <labels border="true" height="196" positionX="390" positionY="240" width="312">This simple stochastic Petri net uniformly samples delays between 0 and 1 and because of the transport arcs that do not reset the age of the token, the age of the token in "accumulated_time" represents the global time that has passed so far. As soon as this age reaches 1, the "timeout" transition fires.
+
+The query asks for the probability of placing a token to the place "finished" and it clearly converges to 1. 
+
+The average number of steps before the place "finished" is marked converges to the Euler number. The higher the precision, the more time it takes to estimate the average number of steps but the more precise approximation of the Euler number we can achieve.</labels>
+    <place displayName="true" id="accumulated_time" initialMarking="1" invariant="&lt; inf" name="accumulated_time" nameOffsetX="0" nameOffsetY="0" positionX="240" positionY="150">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+      <hlinitialMarking>
+        <text>(1'dot)</text>
+        <structure>
+          <add>
+            <subterm>
+              <numberof>
+                <subterm>
+                  <numberconstant value="1">
+                    <positive/>
+                  </numberconstant>
+                </subterm>
+                <subterm>
+                  <useroperator declaration="dot"/>
+                </subterm>
+              </numberof>
+            </subterm>
+          </add>
+        </structure>
+      </hlinitialMarking>
+    </place>
+    <place displayName="true" id="finished" initialMarking="0" invariant="&lt; inf" name="finished" nameOffsetX="0" nameOffsetY="0" positionX="555" positionY="150">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <transition a="0.0" angle="0" b="1.0" displayName="true" distribution="uniform" firingMode="Oldest" id="delay" infiniteServer="false" name="delay" nameOffsetX="56" nameOffsetY="50" player="0" positionX="240" positionY="300" priority="0" urgent="false" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="timeout" infiniteServer="false" name="timeout" nameOffsetX="53" nameOffsetY="-21" player="0" positionX="390" positionY="150" priority="0" urgent="false" value="0.0" weight="1.0"/>
+    <arc id="A1" inscription="[0,inf):1" nameOffsetX="0" nameOffsetY="0" source="accumulated_time" target="delay" transportID="1" type="transport" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="244" yCoord="175"/>
+      <arcpath arcPointType="false" id="1" xCoord="210" yCoord="210"/>
+      <arcpath arcPointType="true" id="2" xCoord="210" yCoord="270"/>
+      <arcpath arcPointType="false" id="3" xCoord="249" yCoord="315"/>
+    </arc>
+    <arc id="A0" inscription="[0,inf):1" nameOffsetX="0" nameOffsetY="0" source="delay" target="accumulated_time" transportID="1" type="transport" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="259" yCoord="315"/>
+      <arcpath arcPointType="false" id="1" xCoord="300" yCoord="270"/>
+      <arcpath arcPointType="true" id="2" xCoord="300" yCoord="210"/>
+      <arcpath arcPointType="false" id="3" xCoord="265" yCoord="175"/>
+    </arc>
+    <arc id="A2" inscription="[1,inf)" nameOffsetX="0" nameOffsetY="0" source="accumulated_time" target="timeout" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="270" yCoord="165"/>
+      <arcpath arcPointType="false" id="1" xCoord="399" yCoord="165"/>
+    </arc>
+    <arc id="A3" inscription="1" nameOffsetX="0" nameOffsetY="0" source="timeout" target="finished" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="409" yCoord="165"/>
+      <arcpath arcPointType="false" id="1" xCoord="555" yCoord="165"/>
+    </arc>
+  </net>
+  <query active="true" algorithmOption="CERTAIN_ZERO" capacity="4" gcd="false" name="Compute Euler number" numberOfTraces="5" overApproximation="false" parallel="true" reductionOption="VerifyDTAPN" smcTraceType="Any" timeDarts="false" traceOption="NONE" type="SMC" verificationType="Quantitative">
+    <smc confidence="0.95" interval-width="0.005" time-bound="1000"/>
+    <formula>
+      <finally>
+        <integer-eq>
+          <tokens-count>
+            <place>Euler.finished</place>
+          </tokens-count>
+          <integer-constant>1</integer-constant>
+        </integer-eq>
+      </finally>
+    </formula>
+  </query>
+  <feature isColored="false" isGame="false" isStochastic="true" isTimed="true"/>
+</pnml>
diff --git a/src/main/resources/Example nets/fair-coin-from-unfair.tapn b/src/main/resources/Example nets/fair-coin-from-unfair.tapn
new file mode 100644
index 000000000..ed29c916c
--- /dev/null
+++ b/src/main/resources/Example nets/fair-coin-from-unfair.tapn	
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<pnml xmlns="http://www.informatik.hu-berlin.de/top/pnml/ptNetb">
+  <declaration>
+    <structure>
+      <declarations>
+        <namedsort id="dot" name="dot">
+          <dot/>
+        </namedsort>
+        <namedsort id="coins" name="coins">
+          <cyclicenumeration>
+            <feconstant id="c1" name="coins"/>
+            <feconstant id="c2" name="coins"/>
+          </cyclicenumeration>
+        </namedsort>
+        <namedsort id="toss" name="toss">
+          <cyclicenumeration>
+            <feconstant id="heads" name="toss"/>
+            <feconstant id="tails" name="toss"/>
+          </cyclicenumeration>
+        </namedsort>
+        <namedsort id="config" name="config">
+          <productsort>
+            <usersort declaration="coins"/>
+            <usersort declaration="toss"/>
+          </productsort>
+        </namedsort>
+        <variabledecl id="t" name="t">
+          <usersort declaration="toss"/>
+        </variabledecl>
+        <variabledecl id="c" name="c">
+          <usersort declaration="coins"/>
+        </variabledecl>
+      </declarations>
+    </structure>
+  </declaration>
+  <constant name="headprob" value="7"/>
+  <constant name="tailprob" value="3"/>
+  <net active="true" id="Coin" type="P/T net">
+    <place displayName="true" id="tossed" initialMarking="0" invariant="&lt; inf" name="tossed" nameOffsetX="43" nameOffsetY="44" positionX="540" positionY="345">
+      <type>
+        <text>config</text>
+        <structure>
+          <usersort declaration="config"/>
+        </structure>
+      </type>
+    </place>
+    <place displayName="true" id="ready_to_toss" initialMarking="2" invariant="&lt; inf" name="ready_to_toss" nameOffsetX="117" nameOffsetY="-9" positionX="540" positionY="30">
+      <type>
+        <text>coins</text>
+        <structure>
+          <usersort declaration="coins"/>
+        </structure>
+      </type>
+      <hlinitialMarking>
+        <text>(1'coins.all)</text>
+        <structure>
+          <add>
+            <subterm>
+              <numberof>
+                <subterm>
+                  <numberconstant value="1">
+                    <positive/>
+                  </numberconstant>
+                </subterm>
+                <subterm>
+                  <all>
+                    <usersort declaration="coins"/>
+                  </all>
+                </subterm>
+              </numberof>
+            </subterm>
+          </add>
+        </structure>
+      </hlinitialMarking>
+    </place>
+    <place displayName="true" id="heads" initialMarking="0" invariant="&lt; inf" name="heads" nameOffsetX="46" nameOffsetY="61" positionX="300" positionY="495">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <place displayName="true" id="tails" initialMarking="0" invariant="&lt; inf" name="tails" nameOffsetX="50" nameOffsetY="55" positionX="795" positionY="495">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="inconclusive" infiniteServer="false" name="inconclusive" nameOffsetX="0" nameOffsetY="0" player="0" positionX="300" positionY="180" priority="0" urgent="false" value="1.0" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="head" infiniteServer="false" name="head" nameOffsetX="3" nameOffsetY="2" player="0" positionX="465" positionY="180" priority="0" urgent="true" value="0.0" weight="headprob"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="tail" infiniteServer="false" name="tail" nameOffsetX="8" nameOffsetY="8" player="0" positionX="615" positionY="180" priority="0" urgent="true" value="0.0" weight="tailprob"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="choosing_heads" infiniteServer="false" name="choosing_heads" nameOffsetX="-20" nameOffsetY="12" player="0" positionX="300" positionY="345" priority="0" urgent="true" value="0.0" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="choosing_tails" infiniteServer="false" name="choosing_tails" nameOffsetX="116" nameOffsetY="11" player="0" positionX="795" positionY="345" priority="0" urgent="true" value="0.0" weight="1.0"/>
+    <arc id="A0" inscription="[0,inf)" nameOffsetX="-37" nameOffsetY="-7" source="tossed" target="inconclusive" type="timed" weight="1">
+      <hlinscription>
+        <text>1'(coins.all, t)</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <tuple>
+                <subterm>
+                  <all>
+                    <usersort declaration="coins"/>
+                  </all>
+                </subterm>
+                <subterm>
+                  <variable refvariable="t"/>
+                </subterm>
+              </tuple>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="542" yCoord="351"/>
+      <arcpath arcPointType="false" id="1" xCoord="319" yCoord="200"/>
+    </arc>
+    <arc id="A1" inscription="1" nameOffsetX="-49" nameOffsetY="-3" source="inconclusive" target="ready_to_toss" type="normal" weight="1">
+      <hlinscription>
+        <text>1'coins.all</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <all>
+                <usersort declaration="coins"/>
+              </all>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="320" yCoord="190"/>
+      <arcpath arcPointType="false" id="1" xCoord="542" yCoord="52"/>
+    </arc>
+    <arc id="A2" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="ready_to_toss" target="head" type="timed" weight="1">
+      <hlinscription>
+        <text>1'c</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <variable refvariable="c"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="547" yCoord="58"/>
+      <arcpath arcPointType="false" id="1" xCoord="479" yCoord="179"/>
+    </arc>
+    <arc id="A3" inscription="1" nameOffsetX="-21" nameOffsetY="-22" source="head" target="tossed" type="normal" weight="1">
+      <hlinscription>
+        <text>1'(c, heads)</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <tuple>
+                <subterm>
+                  <variable refvariable="c"/>
+                </subterm>
+                <subterm>
+                  <useroperator declaration="heads"/>
+                </subterm>
+              </tuple>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="480" yCoord="210"/>
+      <arcpath arcPointType="false" id="1" xCoord="548" yCoord="346"/>
+    </arc>
+    <arc id="A4" inscription="[0,inf)" nameOffsetX="39" nameOffsetY="0" source="ready_to_toss" target="tail" type="timed" weight="1">
+      <hlinscription>
+        <text>1'c</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <variable refvariable="c"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="562" yCoord="58"/>
+      <arcpath arcPointType="false" id="1" xCoord="629" yCoord="179"/>
+    </arc>
+    <arc id="A5" inscription="1" nameOffsetX="61" nameOffsetY="-19" source="tail" target="tossed" type="normal" weight="1">
+      <hlinscription>
+        <text>1'(c, tails)</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <tuple>
+                <subterm>
+                  <variable refvariable="c"/>
+                </subterm>
+                <subterm>
+                  <useroperator declaration="tails"/>
+                </subterm>
+              </tuple>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="630" yCoord="210"/>
+      <arcpath arcPointType="false" id="1" xCoord="561" yCoord="346"/>
+    </arc>
+    <arc id="A6" inscription="[0,inf)" nameOffsetX="69" nameOffsetY="10" source="tossed" target="choosing_heads" type="timed" weight="1">
+      <hlinscription>
+        <text>(1'(c1, heads) + 1'(c2, tails))</text>
+        <structure>
+          <add>
+            <subterm>
+              <numberof>
+                <subterm>
+                  <numberconstant value="1">
+                    <positive/>
+                  </numberconstant>
+                </subterm>
+                <subterm>
+                  <tuple>
+                    <subterm>
+                      <useroperator declaration="c1"/>
+                    </subterm>
+                    <subterm>
+                      <useroperator declaration="heads"/>
+                    </subterm>
+                  </tuple>
+                </subterm>
+              </numberof>
+            </subterm>
+            <subterm>
+              <numberof>
+                <subterm>
+                  <numberconstant value="1">
+                    <positive/>
+                  </numberconstant>
+                </subterm>
+                <subterm>
+                  <tuple>
+                    <subterm>
+                      <useroperator declaration="c2"/>
+                    </subterm>
+                    <subterm>
+                      <useroperator declaration="tails"/>
+                    </subterm>
+                  </tuple>
+                </subterm>
+              </numberof>
+            </subterm>
+          </add>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="540" yCoord="360"/>
+      <arcpath arcPointType="false" id="1" xCoord="319" yCoord="360"/>
+    </arc>
+    <arc id="A7" inscription="1" nameOffsetX="0" nameOffsetY="0" source="choosing_heads" target="heads" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="315" yCoord="375"/>
+      <arcpath arcPointType="false" id="1" xCoord="315" yCoord="495"/>
+    </arc>
+    <arc id="A8" inscription="[0,inf)" nameOffsetX="91" nameOffsetY="19" source="tossed" target="choosing_tails" type="timed" weight="1">
+      <hlinscription>
+        <text>(1'(c1, tails) + 1'(c2, heads))</text>
+        <structure>
+          <add>
+            <subterm>
+              <numberof>
+                <subterm>
+                  <numberconstant value="1">
+                    <positive/>
+                  </numberconstant>
+                </subterm>
+                <subterm>
+                  <tuple>
+                    <subterm>
+                      <useroperator declaration="c1"/>
+                    </subterm>
+                    <subterm>
+                      <useroperator declaration="tails"/>
+                    </subterm>
+                  </tuple>
+                </subterm>
+              </numberof>
+            </subterm>
+            <subterm>
+              <numberof>
+                <subterm>
+                  <numberconstant value="1">
+                    <positive/>
+                  </numberconstant>
+                </subterm>
+                <subterm>
+                  <tuple>
+                    <subterm>
+                      <useroperator declaration="c2"/>
+                    </subterm>
+                    <subterm>
+                      <useroperator declaration="heads"/>
+                    </subterm>
+                  </tuple>
+                </subterm>
+              </numberof>
+            </subterm>
+          </add>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="570" yCoord="360"/>
+      <arcpath arcPointType="false" id="1" xCoord="804" yCoord="360"/>
+    </arc>
+    <arc id="A9" inscription="1" nameOffsetX="0" nameOffsetY="0" source="choosing_tails" target="tails" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="810" yCoord="375"/>
+      <arcpath arcPointType="false" id="1" xCoord="810" yCoord="495"/>
+    </arc>
+  </net>
+  <query active="true" algorithmOption="CERTAIN_ZERO" capacity="4" gcd="false" name="Hit heads" numberOfTraces="1" overApproximation="false" parallel="true" reductionOption="VerifyDTAPN" smcTraceType="Any" timeDarts="false" traceOption="NONE" type="SMC" verificationType="Quantitative">
+    <smc confidence="0.95" interval-width="0.01" time-bound="1000"/>
+    <formula>
+      <finally>
+        <integer-eq>
+          <tokens-count>
+            <place>Coin.heads</place>
+          </tokens-count>
+          <integer-constant>1</integer-constant>
+        </integer-eq>
+      </finally>
+    </formula>
+  </query>
+  <query active="true" algorithmOption="CERTAIN_ZERO" capacity="4" gcd="false" name="Hit tails" numberOfTraces="1" overApproximation="false" parallel="true" reductionOption="VerifyDTAPN" smcTraceType="Any" timeDarts="false" traceOption="NONE" type="SMC" verificationType="Quantitative">
+    <smc confidence="0.95" interval-width="0.01" time-bound="1000"/>
+    <formula>
+      <finally>
+        <integer-eq>
+          <tokens-count>
+            <place>Coin.tails</place>
+          </tokens-count>
+          <integer-constant>1</integer-constant>
+        </integer-eq>
+      </finally>
+    </formula>
+  </query>
+  <query active="true" algorithmOption="CERTAIN_ZERO" capacity="4" gcd="false" name="Inconclusive after 6 rounds" numberOfTraces="1" overApproximation="false" parallel="true" reductionOption="VerifyDTAPN" smcTraceType="Any" timeDarts="false" traceOption="NONE" type="SMC" verificationType="Quantitative">
+    <smc confidence="0.95" interval-width="0.01" time-bound="5"/>
+    <formula>
+      <globally>
+        <conjunction>
+          <integer-eq>
+            <tokens-count>
+              <place>Coin.heads</place>
+            </tokens-count>
+            <integer-constant>0</integer-constant>
+          </integer-eq>
+          <integer-eq>
+            <tokens-count>
+              <place>Coin.tails</place>
+            </tokens-count>
+            <integer-constant>0</integer-constant>
+          </integer-eq>
+        </conjunction>
+      </globally>
+    </formula>
+  </query>
+  <feature isColored="true" isGame="false" isStochastic="true" isTimed="true"/>
+</pnml>
diff --git a/src/main/resources/Example nets/fireflies.tapn b/src/main/resources/Example nets/fireflies.tapn
new file mode 100644
index 000000000..ae2c0d3c0
--- /dev/null
+++ b/src/main/resources/Example nets/fireflies.tapn	
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<pnml xmlns="http://www.informatik.hu-berlin.de/top/pnml/ptNetb">
+  <declaration>
+    <structure>
+      <declarations>
+        <namedsort id="dot" name="dot">
+          <dot/>
+        </namedsort>
+        <namedsort id="fireflies" name="fireflies">
+          <finiteintrange end="6" start="1"/>
+        </namedsort>
+        <variabledecl id="x" name="x">
+          <usersort declaration="fireflies"/>
+        </variabledecl>
+        <variabledecl id="y" name="y">
+          <usersort declaration="fireflies"/>
+        </variabledecl>
+      </declarations>
+    </structure>
+  </declaration>
+  <net active="true" id="TAPN1" type="P/T net">
+    <place displayName="true" id="waiting" initialMarking="6" invariant="&lt; inf" name="waiting" nameOffsetX="0" nameOffsetY="-3" positionX="135" positionY="165">
+      <type>
+        <text>fireflies</text>
+        <structure>
+          <usersort declaration="fireflies"/>
+        </structure>
+      </type>
+      <hlinitialMarking>
+        <text>(1'fireflies.all)</text>
+        <structure>
+          <add>
+            <subterm>
+              <numberof>
+                <subterm>
+                  <numberconstant value="1">
+                    <positive/>
+                  </numberconstant>
+                </subterm>
+                <subterm>
+                  <all>
+                    <usersort declaration="fireflies"/>
+                  </all>
+                </subterm>
+              </numberof>
+            </subterm>
+          </add>
+        </structure>
+      </hlinitialMarking>
+    </place>
+    <place displayName="true" id="charging" initialMarking="0" invariant="&lt; inf" name="charging" nameOffsetX="88" nameOffsetY="21" positionX="390" positionY="165">
+      <type>
+        <text>fireflies</text>
+        <structure>
+          <usersort declaration="fireflies"/>
+        </structure>
+      </type>
+    </place>
+    <place displayName="true" id="charged" initialMarking="0" invariant="&lt; inf" name="charged" nameOffsetX="-9" nameOffsetY="9" positionX="630" positionY="165">
+      <type>
+        <text>fireflies</text>
+        <structure>
+          <usersort declaration="fireflies"/>
+        </structure>
+      </type>
+    </place>
+    <place displayName="true" id="firing" initialMarking="0" invariant="&lt; inf" name="firing" nameOffsetX="89" nameOffsetY="-7" positionX="870" positionY="165">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <transition a="0.0" angle="0" b="2.0" displayName="true" distribution="uniform" firingMode="Oldest" id="arrive" infiniteServer="false" name="arrive" nameOffsetX="55" nameOffsetY="-26" player="0" positionX="270" positionY="165" priority="0" urgent="false" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="normal" firingMode="Oldest" id="ready" infiniteServer="false" mean="0.5" name="ready" nameOffsetX="0" nameOffsetY="0" player="0" positionX="525" positionY="90" priority="0" stddev="0.1" urgent="false" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="exponential" firingMode="Oldest" id="fire_alone" infiniteServer="false" name="fire_alone" nameOffsetX="104" nameOffsetY="-26" player="0" positionX="735" positionY="60" priority="0" rate="0.1" urgent="false" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="fire_jointly" infiniteServer="false" name="fire_jointly" nameOffsetX="66" nameOffsetY="55" player="0" positionX="630" positionY="255" priority="0" urgent="true" value="0.0" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="all_fired" infiniteServer="false" name="all_fired" nameOffsetX="45" nameOffsetY="-11" player="0" positionX="750" positionY="165" priority="0" urgent="true" value="0.0" weight="1.0"/>
+    <arc id="A0" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="waiting" target="arrive" type="timed" weight="1">
+      <hlinscription>
+        <text>1'x</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <variable refvariable="x"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="165" yCoord="180"/>
+      <arcpath arcPointType="false" id="1" xCoord="279" yCoord="180"/>
+    </arc>
+    <arc id="A1" inscription="1" nameOffsetX="0" nameOffsetY="0" source="arrive" target="charging" type="normal" weight="1">
+      <hlinscription>
+        <text>1'x</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <variable refvariable="x"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="289" yCoord="180"/>
+      <arcpath arcPointType="false" id="1" xCoord="390" yCoord="180"/>
+    </arc>
+    <arc id="A2" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="charging" target="ready" type="timed" weight="1">
+      <hlinscription>
+        <text>1'x</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <variable refvariable="x"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="417" yCoord="172"/>
+      <arcpath arcPointType="false" id="1" xCoord="534" yCoord="105"/>
+    </arc>
+    <arc id="A3" inscription="1" nameOffsetX="0" nameOffsetY="0" source="ready" target="charged" type="normal" weight="1">
+      <hlinscription>
+        <text>1'x</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <variable refvariable="x"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="544" yCoord="105"/>
+      <arcpath arcPointType="false" id="1" xCoord="632" yCoord="171"/>
+    </arc>
+    <arc id="A4" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="charged" target="fire_alone" type="timed" weight="1">
+      <hlinscription>
+        <text>1'x</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <variable refvariable="x"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="655" yCoord="169"/>
+      <arcpath arcPointType="false" id="1" xCoord="744" yCoord="75"/>
+    </arc>
+    <arc id="A9" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="charged" target="fire_jointly" type="timed" weight="1">
+      <hlinscription>
+        <text>1'x</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <variable refvariable="x"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="644" yCoord="194"/>
+      <arcpath arcPointType="false" id="1" xCoord="644" yCoord="254"/>
+    </arc>
+    <arc id="A6" inscription="1" nameOffsetX="0" nameOffsetY="0" source="fire_alone" target="firing" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="754" yCoord="80"/>
+      <arcpath arcPointType="false" id="1" xCoord="873" yCoord="170"/>
+    </arc>
+    <arc id="A7" inscription="1" nameOffsetX="0" nameOffsetY="0" source="fire_alone" target="charging" type="normal" weight="1">
+      <hlinscription>
+        <text>1'x</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <variable refvariable="x"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="749" yCoord="59"/>
+      <arcpath arcPointType="false" id="1" xCoord="750" yCoord="30"/>
+      <arcpath arcPointType="false" id="2" xCoord="405" yCoord="30"/>
+      <arcpath arcPointType="false" id="3" xCoord="405" yCoord="165"/>
+    </arc>
+    <arc id="A8" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="firing" target="fire_jointly" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="879" yCoord="193"/>
+      <arcpath arcPointType="true" id="1" xCoord="810" yCoord="270"/>
+      <arcpath arcPointType="false" id="2" xCoord="649" yCoord="275"/>
+    </arc>
+    <arc id="A10" inscription="1" nameOffsetX="0" nameOffsetY="0" source="fire_jointly" target="firing" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="650" yCoord="265"/>
+      <arcpath arcPointType="false" id="1" xCoord="870" yCoord="185"/>
+    </arc>
+    <arc id="A11" inscription="1" nameOffsetX="0" nameOffsetY="0" source="fire_jointly" target="charging" type="normal" weight="1">
+      <hlinscription>
+        <text>1'x</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <variable refvariable="x"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="639" yCoord="270"/>
+      <arcpath arcPointType="false" id="1" xCoord="405" yCoord="270"/>
+      <arcpath arcPointType="false" id="2" xCoord="405" yCoord="195"/>
+    </arc>
+    <arc id="A12" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="firing" target="all_fired" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="870" yCoord="180"/>
+      <arcpath arcPointType="false" id="1" xCoord="769" yCoord="180"/>
+    </arc>
+    <arc id="I12" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="charged" target="all_fired" type="tapnInhibitor" weight="1">
+      <hlinscription>
+        <text>1'fireflies.all</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <all>
+                <usersort declaration="fireflies"/>
+              </all>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="660" yCoord="180"/>
+      <arcpath arcPointType="false" id="1" xCoord="759" yCoord="180"/>
+    </arc>
+    <arc id="I13" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="firing" target="fire_alone" type="tapnInhibitor" weight="1">
+      <hlinscription>
+        <text>1'dot.all</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <all>
+                <usersort declaration="dot"/>
+              </all>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="883" yCoord="165"/>
+      <arcpath arcPointType="true" id="1" xCoord="840" yCoord="75"/>
+      <arcpath arcPointType="false" id="2" xCoord="755" yCoord="70"/>
+    </arc>
+  </net>
+  <query active="true" algorithmOption="CERTAIN_ZERO" capacity="4" gcd="false" name="All fireflies synchronize" numberOfTraces="1" overApproximation="false" parallel="true" reductionOption="VerifyDTAPN" smcTraceType="Any" timeDarts="false" traceOption="NONE" type="SMC" verificationType="Quantitative">
+    <smc confidence="0.95" interval-width="0.01" time-bound="50"/>
+    <formula>
+      <finally>
+        <conjunction>
+          <integer-eq>
+            <tokens-count>
+              <place>TAPN1.charging</place>
+            </tokens-count>
+            <integer-constant>1</integer-constant>
+          </integer-eq>
+          <integer-eq>
+            <tokens-count>
+              <place>TAPN1.firing</place>
+            </tokens-count>
+            <integer-constant>1</integer-constant>
+          </integer-eq>
+          <integer-eq>
+            <tokens-count>
+              <place>TAPN1.waiting</place>
+            </tokens-count>
+            <integer-constant>0</integer-constant>
+          </integer-eq>
+        </conjunction>
+      </finally>
+    </formula>
+  </query>
+  <feature isColored="true" isGame="false" isStochastic="true" isTimed="true"/>
+</pnml>
diff --git a/src/main/resources/Example nets/firing-mode-demo.tapn b/src/main/resources/Example nets/firing-mode-demo.tapn
new file mode 100644
index 000000000..3c74f3ffc
--- /dev/null
+++ b/src/main/resources/Example nets/firing-mode-demo.tapn	
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<pnml xmlns="http://www.informatik.hu-berlin.de/top/pnml/ptNetb">
+  <declaration>
+    <structure>
+      <declarations>
+        <namedsort id="dot" name="dot">
+          <dot/>
+        </namedsort>
+      </declarations>
+    </structure>
+  </declaration>
+  <net active="true" id="TAPN1" type="P/T net">
+    <place displayName="true" id="Buffer" initialMarking="1" invariant="&lt; inf" name="Buffer" nameOffsetX="34" nameOffsetY="-10" positionX="210" positionY="210">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+      <hlinitialMarking>
+        <text>(1'dot)</text>
+        <structure>
+          <add>
+            <subterm>
+              <numberof>
+                <subterm>
+                  <numberconstant value="1">
+                    <positive/>
+                  </numberconstant>
+                </subterm>
+                <subterm>
+                  <useroperator declaration="dot"/>
+                </subterm>
+              </numberof>
+            </subterm>
+          </add>
+        </structure>
+      </hlinitialMarking>
+    </place>
+    <place displayName="true" id="Ready" initialMarking="0" invariant="&lt; inf" name="Ready" nameOffsetX="28" nameOffsetY="42" positionX="105" positionY="315">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <place displayName="true" id="P0" initialMarking="1" invariant="&lt; inf" name="P0" nameOffsetX="22" nameOffsetY="-13" positionX="105" positionY="90">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+      <hlinitialMarking>
+        <text>(1'dot)</text>
+        <structure>
+          <add>
+            <subterm>
+              <numberof>
+                <subterm>
+                  <numberconstant value="1">
+                    <positive/>
+                  </numberconstant>
+                </subterm>
+                <subterm>
+                  <useroperator declaration="dot"/>
+                </subterm>
+              </numberof>
+            </subterm>
+          </add>
+        </structure>
+      </hlinitialMarking>
+    </place>
+    <place displayName="true" id="Youngest" initialMarking="0" invariant="&lt; inf" name="Youngest" nameOffsetX="39" nameOffsetY="-16" positionX="660" positionY="120">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <place displayName="true" id="Oldest" initialMarking="0" invariant="&lt; inf" name="Oldest" nameOffsetX="35" nameOffsetY="-14" positionX="660" positionY="300">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <place displayName="true" id="Selected" initialMarking="0" invariant="&lt; inf" name="Selected" nameOffsetX="37" nameOffsetY="-13" positionX="465" positionY="210">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Random" id="Filter" infiniteServer="false" name="Filter" nameOffsetX="72" nameOffsetY="-29" player="0" positionX="330" positionY="210" priority="0" urgent="false" value="0.0" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="CreateDelay" infiniteServer="false" name="CreateDelay" nameOffsetX="0" nameOffsetY="0" player="0" positionX="105" positionY="210" priority="0" urgent="false" value="2.0" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="YoungestSelected" infiniteServer="false" name="YoungestSelected" nameOffsetX="66" nameOffsetY="-31" player="0" positionX="555" positionY="120" priority="0" urgent="false" value="0.0" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="OldestSelected" infiniteServer="false" name="OldestSelected" nameOffsetX="59" nameOffsetY="42" player="0" positionX="555" positionY="300" priority="0" urgent="false" value="0.0" weight="1.0"/>
+    <arc id="A3" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="P0" target="CreateDelay" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="119" yCoord="119"/>
+      <arcpath arcPointType="false" id="1" xCoord="119" yCoord="209"/>
+    </arc>
+    <arc id="A4" inscription="1" nameOffsetX="0" nameOffsetY="0" source="CreateDelay" target="Buffer" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="124" yCoord="225"/>
+      <arcpath arcPointType="false" id="1" xCoord="210" yCoord="225"/>
+    </arc>
+    <arc id="A5" inscription="1" nameOffsetX="0" nameOffsetY="0" source="CreateDelay" target="Ready" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="120" yCoord="240"/>
+      <arcpath arcPointType="false" id="1" xCoord="120" yCoord="315"/>
+    </arc>
+    <arc id="A9" inscription="[0,inf)" nameOffsetX="-40" nameOffsetY="14" source="Ready" target="Filter" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="135" yCoord="330"/>
+      <arcpath arcPointType="false" id="1" xCoord="345" yCoord="330"/>
+      <arcpath arcPointType="false" id="2" xCoord="345" yCoord="240"/>
+    </arc>
+    <arc id="A8" inscription="[0,inf):1" nameOffsetX="16" nameOffsetY="14" source="Buffer" target="Filter" transportID="1" type="transport" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="240" yCoord="225"/>
+      <arcpath arcPointType="false" id="1" xCoord="339" yCoord="225"/>
+    </arc>
+    <arc id="A7" inscription="[0,inf):1" nameOffsetX="0" nameOffsetY="0" source="Filter" target="Selected" transportID="1" type="transport" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="349" yCoord="225"/>
+      <arcpath arcPointType="false" id="1" xCoord="465" yCoord="225"/>
+    </arc>
+    <arc id="A10" inscription="[0,1]" nameOffsetX="-3" nameOffsetY="-12" source="Selected" target="YoungestSelected" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="490" yCoord="214"/>
+      <arcpath arcPointType="false" id="1" xCoord="564" yCoord="135"/>
+    </arc>
+    <arc id="A11" inscription="[1,inf)" nameOffsetX="2" nameOffsetY="16" source="Selected" target="OldestSelected" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="490" yCoord="235"/>
+      <arcpath arcPointType="false" id="1" xCoord="564" yCoord="315"/>
+    </arc>
+    <arc id="A12" inscription="1" nameOffsetX="0" nameOffsetY="0" source="YoungestSelected" target="Youngest" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="574" yCoord="135"/>
+      <arcpath arcPointType="false" id="1" xCoord="660" yCoord="135"/>
+    </arc>
+    <arc id="A13" inscription="1" nameOffsetX="0" nameOffsetY="0" source="OldestSelected" target="Oldest" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="574" yCoord="315"/>
+      <arcpath arcPointType="false" id="1" xCoord="660" yCoord="315"/>
+    </arc>
+  </net>
+  <query active="true" algorithmOption="CERTAIN_ZERO" capacity="4" gcd="false" name="Oldest selected" numberOfTraces="1" overApproximation="false" parallel="true" reductionOption="VerifyDTAPN" smcTraceType="Any" timeDarts="false" traceOption="NONE" type="SMC" verificationType="Quantitative">
+    <smc confidence="0.95" interval-width="0.001" time-bound="1000"/>
+    <formula>
+      <finally>
+        <integer-eq>
+          <tokens-count>
+            <place>TAPN1.Oldest</place>
+          </tokens-count>
+          <integer-constant>1</integer-constant>
+        </integer-eq>
+      </finally>
+    </formula>
+  </query>
+  <query active="true" algorithmOption="CERTAIN_ZERO" capacity="4" gcd="false" name="Youngest selected" numberOfTraces="1" overApproximation="false" parallel="true" reductionOption="VerifyDTAPN" smcTraceType="" timeDarts="false" traceOption="NONE" type="SMC" verificationType="Quantitative">
+    <smc confidence="0.95" interval-width="0.05" time-bound="1000"/>
+    <formula>
+      <finally>
+        <integer-eq>
+          <tokens-count>
+            <place>TAPN1.Youngest</place>
+          </tokens-count>
+          <integer-constant>1</integer-constant>
+        </integer-eq>
+      </finally>
+    </formula>
+  </query>
+  <feature isColored="false" isGame="false" isStochastic="true" isTimed="true"/>
+</pnml>
diff --git a/src/main/resources/Example nets/stochastic-consumer-producer.tapn b/src/main/resources/Example nets/stochastic-consumer-producer.tapn
new file mode 100644
index 000000000..964f1a597
--- /dev/null
+++ b/src/main/resources/Example nets/stochastic-consumer-producer.tapn	
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<pnml xmlns="http://www.informatik.hu-berlin.de/top/pnml/ptNetb">
+  <declaration>
+    <structure>
+      <declarations>
+        <namedsort id="dot" name="dot">
+          <dot/>
+        </namedsort>
+      </declarations>
+    </structure>
+  </declaration>
+  <net active="true" id="TAPN1" type="P/T net">
+    <place displayName="true" id="Ready" initialMarking="1" invariant="&lt; inf" name="Ready" nameOffsetX="32" nameOffsetY="-16" positionX="180" positionY="120">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+      <hlinitialMarking>
+        <text>(1'dot)</text>
+        <structure>
+          <add>
+            <subterm>
+              <numberof>
+                <subterm>
+                  <numberconstant value="1">
+                    <positive/>
+                  </numberconstant>
+                </subterm>
+                <subterm>
+                  <useroperator declaration="dot"/>
+                </subterm>
+              </numberof>
+            </subterm>
+          </add>
+        </structure>
+      </hlinitialMarking>
+    </place>
+    <place displayName="true" id="Resting" initialMarking="0" invariant="&lt; inf" name="Resting" nameOffsetX="37" nameOffsetY="43" positionX="180" positionY="270">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <place displayName="true" id="Store" initialMarking="0" invariant="&lt; inf" name="Store" nameOffsetX="31" nameOffsetY="-17" positionX="435" positionY="195">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <place displayName="true" id="Waste" initialMarking="0" invariant="&lt; inf" name="Waste" nameOffsetX="33" nameOffsetY="47" positionX="435" positionY="405">
+      <type>
+        <text>dot</text>
+        <structure>
+          <usersort declaration="dot"/>
+        </structure>
+      </type>
+    </place>
+    <transition a="0.5" angle="0" b="1.5" displayName="true" distribution="uniform" firingMode="Oldest" id="Recover" infiniteServer="false" name="Recover" nameOffsetX="63" nameOffsetY="-38" player="0" positionX="75" positionY="195" priority="0" urgent="false" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="normal" firingMode="Oldest" id="Produce" infiniteServer="false" mean="1.5" name="Produce" nameOffsetX="98" nameOffsetY="-31" player="0" positionX="285" positionY="195" priority="0" stddev="0.3" urgent="false" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="exponential" firingMode="Random" id="Consume1" infiniteServer="false" name="Consume1" nameOffsetX="124" nameOffsetY="7" player="0" positionX="615" positionY="120" priority="0" rate="0.4" urgent="false" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="exponential" firingMode="Youngest" id="Consume2" infiniteServer="false" name="Consume2" nameOffsetX="125" nameOffsetY="9" player="0" positionX="615" positionY="270" priority="0" rate="0.6" urgent="false" weight="1.0"/>
+    <transition angle="0" displayName="true" distribution="constant" firingMode="Oldest" id="Expire" infiniteServer="false" name="Expire" nameOffsetX="107" nameOffsetY="-1" player="0" positionX="435" positionY="300" priority="0" urgent="false" value="0.0" weight="Infinity"/>
+    <arc id="A0" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="Ready" target="Produce" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="207" yCoord="143"/>
+      <arcpath arcPointType="false" id="1" xCoord="296" yCoord="206"/>
+    </arc>
+    <arc id="A1" inscription="1" nameOffsetX="0" nameOffsetY="0" source="Produce" target="Resting" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="295" yCoord="216"/>
+      <arcpath arcPointType="false" id="1" xCoord="207" yCoord="277"/>
+    </arc>
+    <arc id="A2" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="Resting" target="Recover" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="183" yCoord="277"/>
+      <arcpath arcPointType="false" id="1" xCoord="95" yCoord="216"/>
+    </arc>
+    <arc id="A3" inscription="1" nameOffsetX="0" nameOffsetY="0" source="Recover" target="Ready" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="96" yCoord="206"/>
+      <arcpath arcPointType="false" id="1" xCoord="183" yCoord="144"/>
+    </arc>
+    <arc id="A4" inscription="1" nameOffsetX="0" nameOffsetY="0" source="Produce" target="Store" type="normal" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="305" yCoord="210"/>
+      <arcpath arcPointType="false" id="1" xCoord="435" yCoord="210"/>
+    </arc>
+    <arc id="A8" inscription="[0,inf)" nameOffsetX="8" nameOffsetY="-18" source="Store" target="Consume1" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="464" yCoord="204"/>
+      <arcpath arcPointType="false" id="1" xCoord="625" yCoord="136"/>
+    </arc>
+    <arc id="A15" inscription="[3,8]" nameOffsetX="6" nameOffsetY="21" source="Store" target="Consume2" type="timed" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="464" yCoord="216"/>
+      <arcpath arcPointType="false" id="1" xCoord="625" yCoord="286"/>
+    </arc>
+    <arc id="A7" inscription="[9,inf):1" nameOffsetX="0" nameOffsetY="0" source="Expire" target="Waste" transportID="1" type="transport" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="450" yCoord="330"/>
+      <arcpath arcPointType="false" id="1" xCoord="450" yCoord="405"/>
+    </arc>
+    <arc id="A9" inscription="[9,inf):1" nameOffsetX="0" nameOffsetY="0" source="Store" target="Expire" transportID="1" type="transport" weight="1">
+      <hlinscription>
+        <text>1'dot</text>
+        <structure>
+          <numberof>
+            <subterm>
+              <numberconstant value="1">
+                <positive/>
+              </numberconstant>
+            </subterm>
+            <subterm>
+              <useroperator declaration="dot"/>
+            </subterm>
+          </numberof>
+        </structure>
+      </hlinscription>
+      <arcpath arcPointType="false" id="0" xCoord="450" yCoord="225"/>
+      <arcpath arcPointType="false" id="1" xCoord="450" yCoord="300"/>
+    </arc>
+  </net>
+  <query active="true" algorithmOption="CERTAIN_ZERO" capacity="4" gcd="false" name="Stays under capacity" numberOfTraces="1" overApproximation="false" parallel="true" reductionOption="VerifyDTAPN" smcTraceType="Any" timeDarts="false" traceOption="NONE" type="SMC" verificationType="Quantitative">
+    <smc confidence="0.95" interval-width="0.01" time-bound="100"/>
+    <formula>
+      <globally>
+        <integer-le>
+          <tokens-count>
+            <place>TAPN1.Store</place>
+          </tokens-count>
+          <integer-constant>3</integer-constant>
+        </integer-le>
+      </globally>
+    </formula>
+  </query>
+  <query active="true" algorithmOption="CERTAIN_ZERO" capacity="4" gcd="false" name="Overflow trace" numberOfTraces="3" overApproximation="false" parallel="true" reductionOption="VerifyDTAPN" smcTraceType="Not satisfied" timeDarts="false" traceOption="NONE" type="SMC" verificationType="Simulate">
+    <smc confidence="0.95" interval-width="0.05" time-bound="1000"/>
+    <formula>
+      <globally>
+        <integer-le>
+          <tokens-count>
+            <place>TAPN1.Store</place>
+          </tokens-count>
+          <integer-constant>3</integer-constant>
+        </integer-le>
+      </globally>
+    </formula>
+  </query>
+  <query active="true" algorithmOption="CERTAIN_ZERO" capacity="4" gcd="false" name="Too much waste" numberOfTraces="1" overApproximation="false" parallel="true" reductionOption="VerifyDTAPN" smcTraceType="Any" timeDarts="false" traceOption="NONE" type="SMC" verificationType="Quantitative">
+    <smc confidence="0.95" interval-width="0.01" time-bound="100"/>
+    <formula>
+      <finally>
+        <integer-ge>
+          <tokens-count>
+            <place>TAPN1.Waste</place>
+          </tokens-count>
+          <integer-constant>3</integer-constant>
+        </integer-ge>
+      </finally>
+    </formula>
+  </query>
+  <feature isColored="false" isGame="false" isStochastic="true" isTimed="true"/>
+</pnml>