diff --git a/EGNG.json b/EGNG.json
new file mode 100644
index 0000000..bc3dcdd
--- /dev/null
+++ b/EGNG.json
@@ -0,0 +1,40 @@
+{
+  "t0marker": ["Nogo"],
+  "t0shift": 0.023,
+  "tEpoch": [-1.0, 1.25],
+  "tInterest": [-0.5, 0.75],
+  "defaults": {
+    "tSearch": [0.05, 1.0]
+  },
+  "details": [{
+    "name": "Happy",
+    "require": [{
+      "trigName": "Happy",
+      "tSearch": [-0.05, 0.05],
+      "type": "includeOnce"
+    }, {
+      "trigName": "Incorrect",
+      "tSearch": [0, {
+        "trigName": ["Nogo", "Go"],
+        "within": [0.1, 3],
+        "offset": -0.05
+      }],
+      "type": "incorrect"
+    }]
+  }, {
+    "name": "Angry",
+    "require": [{
+      "trigName": "Angry",
+      "tSearch": [-0.05, 0.05],
+      "type": "includeOnce"
+    }, {
+      "trigName": "Incorrect",
+      "tSearch": [0, {
+        "trigName": ["Nogo", "Go"],
+        "within": [0.1, 3],
+        "offset": -0.05
+      }],
+      "type": "incorrect"
+    }]
+  }]
+}
diff --git a/GoNogo.json b/GoNogo.json
index bc3dcdd..744eead 100644
--- a/GoNogo.json
+++ b/GoNogo.json
@@ -1,40 +1,46 @@
 {
-  "t0marker": ["Nogo"],
-  "t0shift": 0.023,
-  "tEpoch": [-1.0, 1.25],
-  "tInterest": [-0.5, 0.75],
-  "defaults": {
-    "tSearch": [0.05, 1.0]
-  },
-  "details": [{
-    "name": "Happy",
-    "require": [{
-      "trigName": "Happy",
-      "tSearch": [-0.05, 0.05],
-      "type": "includeOnce"
-    }, {
-      "trigName": "Incorrect",
-      "tSearch": [0, {
-        "trigName": ["Nogo", "Go"],
-        "within": [0.1, 3],
-        "offset": -0.05
-      }],
-      "type": "incorrect"
+    "t0marker": ["Go", "Nogo"],
+    "t0shift": 0.023,
+    "tEpoch": [-1,1.5],
+    "tInterest": [-1,1.5],
+    "defaults": {"tSearch": [0.05, 1], "getTrigStats": []},
+    "name": "GoNoGo",
+    "shortname": "gonogo",
+    "details": [{
+            "name": "Go",
+            "shortname": "go",
+            "require": [{
+                "trigName": ["Go"], 
+                "tSearch": [-0.1, 0.1], 
+                "type": "include"
+              }, {
+                  "trigName": ["Correct", "Incorrect"], 
+                  "tSearch": [0.15, {"trigName": ["Nogo", "Go"], "within": [0.15, 5], "offset": -0.05}], 
+                  "type": "correct"
+              }]
+      },{
+            "name": "NogoCorr",
+            "shortname": "Nogocorr",
+            "require": [{
+              "trigName": ["Nogo"], 
+              "tSearch": [-0.1, 0.1],  
+              "type": "include"
+              }, {
+                "trigName": ["Incorrect"], 
+                "tSearch": [0.15, {"trigName": ["Nogo", "Go"], "within": [0.15, 5], "offset": -0.05}], 
+                "type": "exclude"
+              }]
+      },{
+            "name": "NogoComm",
+            "shortname": "Nogocomm",
+            "require": [{
+              "trigName": ["Nogo"], 
+              "tSearch": [-0.1, 0.1], 
+              "type": "include"
+              }, {
+                "trigName": ["Incorrect"], 
+                "tSearch": [0.15, {"trigName": ["Nogo", "Go"], "within": [0.15, 5], "offset": -0.05}], 
+                "type": "correct"
+              }]
     }]
-  }, {
-    "name": "Angry",
-    "require": [{
-      "trigName": "Angry",
-      "tSearch": [-0.05, 0.05],
-      "type": "includeOnce"
-    }, {
-      "trigName": "Incorrect",
-      "tSearch": [0, {
-        "trigName": ["Nogo", "Go"],
-        "within": [0.1, 3],
-        "offset": -0.05
-      }],
-      "type": "incorrect"
-    }]
-  }]
 }
diff --git a/NBack_v6.json b/NBack_v6.json
new file mode 100644
index 0000000..30bb760
--- /dev/null
+++ b/NBack_v6.json
@@ -0,0 +1,74 @@
+{
+  "t0marker": ["New", "Repeat"],
+  "t0shift": 0,
+  "tEpoch": [-1.0, 1.25],
+  "tInterest": [-1.0, 1.25],
+  "defaults": {
+    "tSearch": [-0.01, 0.01]
+  },
+  "details": [{
+    "name": "New",
+    "shortname": "new",
+    "require": [{
+      "trigName": "New",
+      "tSearch": [-0.1, 0.1],
+      "type": "include"
+    }, {
+      "trigName": ["IncorrectR", "IncorrectL"],
+      "type": "incorrect",
+      "tSearch": [0.1, {
+        "trigName": ["New", "Repeat"],
+        "within": [0.1, 3.0],
+        "offset": 0
+      }]
+    }]
+  }, {
+    "name": "Repeat",
+    "shortname": "rpt",
+    "require": [{
+      "trigName": "Repeat",
+      "tSearch": [-0.1, 0.1],
+      "type": "include"
+    }, {
+      "trigName": ["CorrectR", "CorrectL"],
+      "type": "correct",
+      "tSearch": [0.1, {
+        "trigName": ["New", "Repeat"],
+        "within": [0.1, 3.0],
+        "offset": 0
+      }]
+    }]
+  }, {
+    "name": "NewIncorrect",
+    "shortname": "newinc",
+    "require": [{
+      "trigName": "New",
+      "tSearch": [-0.1, 0.1],
+      "type": "include"
+    }, {
+      "trigName": ["IncorrectR", "IncorrectL"],
+      "type": "correct",
+      "tSearch": [0.1, {
+        "trigName": ["New", "Repeat"],
+        "within": [0.1, 3.0],
+        "offset": 0
+      }]
+    }]
+  }, {
+    "name": "RepeatIncorrect",
+    "shortname": "rptinc",
+    "require": [{
+      "trigName": "Repeat",
+      "tSearch": [-0.1, 0.1],
+      "type": "include"
+    }, {
+      "trigName": ["CorrectR", "CorrectL"],
+      "type": "exclude",
+      "tSearch": [0.1, {
+        "trigName": ["New", "Repeat"],
+        "within": [0.1, 3.0],
+        "offset": 0
+      }]
+    }]
+  }]
+}
diff --git a/Oddball.json b/Oddball.json
new file mode 100644
index 0000000..bc5e8b4
--- /dev/null
+++ b/Oddball.json
@@ -0,0 +1,34 @@
+{
+    "t0marker": ["Target", "Distractor"],
+    "t0shift": 0.023,
+    "tEpoch": [-1,1.5],
+    "tInterest": [-1,1.5],
+    "defaults": {"tSearch": [0.05, 1], "getTrigStats": []},
+    "name": "Oddball",
+    "shortname": "oddball",
+    "details": [{
+            "name": "Target",
+            "shortname": "target",
+            "require": [{
+                "trigName": ["Target"], 
+                "tSearch": [-0.1, 0.1], 
+                "type": "include"
+              }, {
+                  "trigName": ["Correct", "ISI"], 
+                  "tSearch": [0.15, {"trigName": ["Target", "Distractor"], "within": [0.15, 5], "offset": -0.05}], 
+                  "type": "correct"
+                }]
+      },{
+            "name": "Distractor",
+            "shortname": "Distractor",
+            "require": [{
+              "trigName": ["Distractor"], 
+              "tSearch": [-0.1, 0.1], 
+              "type": "include"
+              }, {
+                "trigName": ["Correct"], 
+                "tSearch": [0.15, {"trigName": ["Target", "Distractor"], "within": [0.15, 5], "offset": -0.05}], 
+                "type": "correct"
+              }]
+    }]
+}
diff --git a/SetShifting_EDID.json b/SetShifting_EDID.json
new file mode 100755
index 0000000..9716fc7
--- /dev/null
+++ b/SetShifting_EDID.json
@@ -0,0 +1,80 @@
+{
+  "t0marker": ["ShapeRule","ColorRule"],
+  "t0shift": 0.023,
+  "tEpoch": [-1.0, 2.25],
+  "tInterest": [-0.5, 1.5],
+  "defaults": {
+    "tSearch": [-0.01, 0.01],
+    "getTrigStats": []
+  },
+  "details": [{
+    "name": "ExtraDim",
+    "require": [{
+      "trigName": ["ExtraDim"],
+      "tSearch": [-0.1, 0.1],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "correct"
+    }]
+  }, {
+    "name": "IntraDim",
+    "require": [{
+      "trigName": ["IntraDim"],
+      "tSearch": [-0.1, 0.1],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "correct"
+    }]
+  }, {
+    "name": "NoShift",
+    "require": [{
+      "trigName": ["ExtraDim", "IntraDim"],
+      "tSearch": [-0.1, 0.1],
+      "type": "exclude"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "correct"
+    }]
+  }]
+}
diff --git a/SetShifting_Response.json b/SetShifting_Response.json
new file mode 100755
index 0000000..8252947
--- /dev/null
+++ b/SetShifting_Response.json
@@ -0,0 +1,25 @@
+{
+  "t0marker": ["Correct"],
+  "t0shift": 0,
+  "tEpoch": [-2,1],
+  "tInterest": [-2,1],
+  "defaults": {
+    "tSearch": [-0.01, 0.01],
+    "getTrigStats": []
+  },
+  "details": [{
+    "name": "Shift",
+    "require": [{
+      "trigName": ["ExtraDim", "IntraDim"],
+      "tSearch": [-4 -0.1],
+      "type": "include"
+    }]
+  }, {
+    "name": "NoShift",
+    "require": [{
+      "trigName": ["ExtraDim", "IntraDim"],
+      "tSearch": [-4 -0.1],
+      "type": "exclude"
+    }]
+  }]
+}
diff --git a/SetShifting_all.json b/SetShifting_all.json
new file mode 100755
index 0000000..65ec411
--- /dev/null
+++ b/SetShifting_all.json
@@ -0,0 +1,61 @@
+{
+  "t0marker": ["ShapeRule","ColorRule"],
+  "t0shift": 0.023,
+  "tEpoch": [-1, 1],
+  "tInterest": [-1, 1],
+  "defaults": {
+    "tSearch": [-0.01, 0.01],
+    "getTrigStats": []
+  },
+  "name": "Set Shifting",
+  "shortname": "setshifting",
+  "details": [{
+    "name": "Shift",
+	"shortname": "shift",
+    "require": [{
+      "trigName": ["ExtraDim", "IntraDim"],
+      "tSearch": [-0.1, 0.1],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "correct"
+    }]
+  }, {
+	"name": "Non-shift",
+    "shortname": "noshift",
+    "require": [{
+      "trigName": ["ExtraDim", "IntraDim"],
+      "tSearch": [-0.1, 0.1],
+      "type": "exclude"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "correct"
+    }]
+  }]
+}
diff --git a/SetShifting_incorrect.json b/SetShifting_incorrect.json
new file mode 100755
index 0000000..086de4e
--- /dev/null
+++ b/SetShifting_incorrect.json
@@ -0,0 +1,57 @@
+{
+  "t0marker": ["ShapeRule","ColorRule"],
+  "t0shift": 0.023,
+  "tEpoch": [-1.0, 4],
+  "tInterest": [-0.75, 0.75],
+  "defaults": {
+    "tSearch": [-0.01, 0.01],
+    "getTrigStats": []
+  },
+  "details": [{
+    "name": "Shift",
+    "require": [{
+      "trigName": ["ExtraDim", "IntraDim"],
+      "tSearch": [-0.1, 0.1],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "correct"
+    }]
+  }, {
+    "name": "NoShift",
+    "require": [{
+      "trigName": ["ExtraDim", "IntraDim"],
+      "tSearch": [-0.1, 0.1],
+      "type": "exclude"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "include"
+    }, {
+      "trigName": ["Correct"],
+      "tSearch": [0.1, {
+        "trigName": ["ShapeRule", "ColorRule"], 
+        "within": [0.15, 5.0], 
+        "offset": 0
+      }],
+      "type": "correct"
+    }]
+  }]
+}