Index: trunk/src/scriptbuilder/structures/ScriptIncident.java
===================================================================
--- trunk/src/scriptbuilder/structures/ScriptIncident.java	(revision 7)
+++ trunk/src/scriptbuilder/structures/ScriptIncident.java	(revision 9)
@@ -19,5 +19,5 @@
  * @version 2017/06/29
  */
-public class ScriptIncident extends Observable
+public class ScriptIncident
 {
 
@@ -66,4 +66,6 @@
      */
     private int latestStart = 0;
+
+    SimulationScript script;
 
     /**
@@ -82,5 +84,5 @@
         this.name = name;
         this.description = description;
-        this.addObserver(script);
+        this.script = script;
         slices = new TreeMap<Integer, TimeSlice>();
     }
@@ -102,5 +104,5 @@
         this.name = name;
         this.description = description;
-        this.addObserver(script);
+        this.script = script;
         slices = new TreeMap<Integer, TimeSlice>();
     }
@@ -124,5 +126,5 @@
         this.name = name;
         this.description = description;
-        this.addObserver(script);
+        this.script = script;
         slices = new TreeMap<Integer, TimeSlice>();
         this.setOffset(offset);
@@ -137,6 +139,5 @@
     {
         this.collapsed = collapsed;
-        setChanged();
-        notifyObservers();
+        script.update();
     }
 
@@ -150,6 +151,5 @@
     {
         this.offset = offset;
-        setChanged();
-        notifyObservers();
+        script.update();
     }
 
@@ -253,6 +253,5 @@
         if (this.slices.get(i) != null)
         {
-            setChanged();
-            notifyObservers(new SliceChangedEvent(this.slices.get(i)));
+            script.broadcastEvent(new SliceChangedEvent(this.slices.get(i)));
         }
     }
@@ -277,6 +276,5 @@
     public void setIncidentActive()
     {
-        setChanged();
-        notifyObservers(new IncidentFocusedEvent(this));
+        script.broadcastEvent(new IncidentFocusedEvent(this));
     }