diff --git a/.gitignore b/.gitignore
index 8dbc75a7012a1f203dbdceb4c5ac579a27b7bde0..b47c17b23c7dc80d23f2b5618790ae3e508e6599 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,10 @@
 /examples/otherProjects/WebsocketGateway/dist/
 /examples/otherProjects/WebsocketGateway/nbproject/private/
 
+/examples/src/ViskitOpenDis7Examples/AnalystReports/
+/examples/src/ViskitOpenDis7Examples/build/
+/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar
+
 # unable to fix, retained as .zip
 /assignments/src/MV3500Cohort2022MayJune/homework2/Royer/build/
 /assignments/src/MV3500Cohort2022MayJune/homework2/Royer/Homework2/build/
@@ -65,9 +69,7 @@
 /assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/nbproject/build-impl.xml~
 /assignments/src/MV3500Cohort2022MayJune/projects/Royer/TwoCranesBerth/pduLog/
 
-/examples/src/ViskitOpenDis7Examples/AnalystReports/
-/examples/src/ViskitOpenDis7Examples/build/
 /viskit/MyViskitProjects/DefaultProject/build/
 /viskit/MyViskitProjects/DefaultProject/AnalystReports/
 /viskit/logs
-/viskit/pduLog/
+/viskit/pduLog/
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 52600ba1db0af2eb4f507158ca66538eae12ac22..b82952b56e3e16e7e467eb93e260c09fe30d2450 100644
--- a/build.xml
+++ b/build.xml
@@ -281,6 +281,7 @@ POSSIBILITY OF SUCH DAMAGE.
     </target>
 
     <target name="run.viskit" depends="set.classpath" description="Start the Visual Simikit (viskit) DES Authoring Tool on any O/S">
+        <ant antfile="examples/build.xml" target="jar" useNativeBasedir="true"/>
         <splash imageurl="file:${basedir}/${splash.image}"
                 useproxy="true"
                 showduration="5000"/>
diff --git a/examples/nbproject/project.properties b/examples/nbproject/project.properties
index 78c2fc8c6a537be84878b6149c35adf014db084f..2c4784d884df4725ec2f7d7425ebc4c9d8df4e75 100644
--- a/examples/nbproject/project.properties
+++ b/examples/nbproject/project.properties
@@ -1,121 +1,242 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.desc=Example programs provided as part of NPS course Networked Graphics MV3500. This course is an introduction to network communications in simulation applications. Topics include an introduction to the TCP/IP protocol stack; TCP/IP socket communications, including TCP, UDP, and multicast; and protocol design issues, with emphasis on Distributed Interactive Simulation (DIS) Protocol and High Level Architecture (HLA). Course emphasis is on creation and testing of network programming network code and web-browser applications.
-application.homepage=https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/examples
-application.splash=..\\..\\NetworkedGraphicsMV3500\\documentation\\images\\OpenDisSurferDude.png
-application.title=NPS Networked Graphics MV3500 examples
-application.vendor=Don Brutzman
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.modulepath=\
-    ${run.modulepath}
-debug.test.classpath=\
-    ${run.test.classpath}
-debug.test.modulepath=\
-    ${run.test.modulepath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.name=Networked_Graphics_MV3500_examples
-dist.jar=${dist.dir}/${dist.name}.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-project.licensePath=../license.txt
-viskit.proj.dir=ViskitOpenDis7Examples
-viskit.proj.lib.dir=src/${viskit.proj.dir}/lib
-opendis.helper=SimkitOpenDis7Examples.run.OpenDisHelper
-excludes=ViskitOpenDis7Examples/
-file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar
-file.reference.opendis7-full.jar=../lib/opendis7-full.jar
-file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar
-file.reference.simkit-doc.zip=../lib/simkit-doc.zip
-file.reference.simkit-src.zip=../lib/simkit-src.zip
-file.reference.simkit.jar=../lib/simkit.jar
-#file.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-classes.jar
-#file.reference.opendis7-pdus-classes.jar=../lib/opendis7-pdus-classes.jar
-includes=**/*.java
-jar.compress=false
-javac.classpath=\
-    ${file.reference.opendis7-full.jar}:\
-    ${file.reference.open-dis_4.16.jar}:\
-    ${file.reference.dis-enums-1.3.jar}:\
-    ${file.reference.simkit.jar}:\
-    ${file.reference.simkit-doc.zip}:\
-    ${file.reference.simkit-src.zip}
-#   ${file.reference.opendis7-enumerations-classes.jar}:\
-#   ${file.reference.opendis7-pdus-classes.jar}:\
-
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
-javac.deprecation=false
-javac.external.vm=true
-javac.modulepath=
-javac.processormodulepath=
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=22
-javac.target=22
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.modulepath=\
-    ${javac.modulepath}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=-header "NPS Networked Graphics MV3500 Examples"
-javadoc.author=true
-javadoc.encoding=${source.encoding}
-javadoc.html5=false
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-#javadoc.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-javadoc.jar
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=MV3500 Examples
-jlink.launcher=false
-jlink.launcher.name=Networked_Graphics_MV3500_examples
-main.class=TcpExamples.TcpExample1Telnet
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=JDK_22
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.modulepath=\
-    ${javac.modulepath}
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-run.test.modulepath=\
-    ${javac.test.modulepath}
-source.encoding=UTF-8
-#source.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-source.jar
-src.dir=src
-src.src.dir=otherProjects\\DisDemo\\src
-src.src2.dir=otherProjects\\DisShooting\\src
-src.src3.dir=otherProjects\\WebSocketGateway\\src
-#src.src4.dir=otherProjects\\BasicServletDemo\\src
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.desc=Example programs provided as part of NPS course Networked Graphics MV3500. This course is an introduction to network communications in simulation applications. Topics include an introduction to the TCP/IP protocol stack; TCP/IP socket communications, including TCP, UDP, and multicast; and protocol design issues, with emphasis on Distributed Interactive Simulation (DIS) Protocol and High Level Architecture (HLA). Course emphasis is on creation and testing of network programming network code and web-browser applications.
+application.homepage=https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/examples
+application.splash=..\\..\\NetworkedGraphicsMV3500\\documentation\\images\\OpenDisSurferDude.png
+application.title=NPS Networked Graphics MV3500 examples
+application.vendor=Don Brutzman
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
+debug.test.classpath=\
+    ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.name=Networked_Graphics_MV3500_examples
+dist.jar=${dist.dir}/${dist.name}.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+project.licensePath=../license.txt
+viskit.proj.dir=ViskitOpenDis7Examples
+viskit.proj.lib.dir=src/${viskit.proj.dir}/lib
+opendis.helper=SimkitOpenDis7Examples.run.OpenDisHelper
+excludes=ViskitOpenDis7Examples/
+file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar
+file.reference.opendis7-full.jar=../lib/opendis7-full.jar
+file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar
+file.reference.simkit-doc.zip=../lib/simkit-doc.zip
+file.reference.simkit-src.zip=../lib/simkit-src.zip
+file.reference.simkit.jar=../lib/simkit.jar
+#file.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-classes.jar
+#file.reference.opendis7-pdus-classes.jar=../lib/opendis7-pdus-classes.jar
+includes=**/*.java
+jar.compress=false
+javac.classpath=\
+    ${file.reference.opendis7-full.jar}:\
+    ${file.reference.open-dis_4.16.jar}:\
+    ${file.reference.dis-enums-1.3.jar}:\
+    ${file.reference.simkit.jar}:\
+    ${file.reference.simkit-doc.zip}:\
+    ${file.reference.simkit-src.zip}
+#   ${file.reference.opendis7-enumerations-classes.jar}:\
+#   ${file.reference.opendis7-pdus-classes.jar}:\
+
+# Space-separated list of extra javac options
+javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
+javac.deprecation=false
+javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=22
+javac.target=22
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=-header "NPS Networked Graphics MV3500 Examples"
+javadoc.author=true
+javadoc.encoding=${source.encoding}
+javadoc.html5=false
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+#javadoc.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-javadoc.jar
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=MV3500 Examples
+jlink.launcher=false
+jlink.launcher.name=Networked_Graphics_MV3500_examples
+main.class=TcpExamples.TcpExample1Telnet
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=JDK_22
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+source.encoding=UTF-8
+#source.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-source.jar
+src.dir=src
+src.src.dir=otherProjects\\DisDemo\\src
+src.src2.dir=otherProjects\\DisShooting\\src
+src.src3.dir=otherProjects\\WebSocketGateway\\src
+#src.src4.dir=otherProjects\\BasicServletDemo\\src
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.desc=Example programs provided as part of NPS course Networked Graphics MV3500. This course is an introduction to network communications in simulation applications. Topics include an introduction to the TCP/IP protocol stack; TCP/IP socket communications, including TCP, UDP, and multicast; and protocol design issues, with emphasis on Distributed Interactive Simulation (DIS) Protocol and High Level Architecture (HLA). Course emphasis is on creation and testing of network programming network code and web-browser applications.
+application.homepage=https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/examples
+application.splash=..\\..\\NetworkedGraphicsMV3500\\documentation\\images\\OpenDisSurferDude.png
+application.title=NPS Networked Graphics MV3500 examples
+application.vendor=Don Brutzman
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
+debug.test.classpath=\
+    ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.name=Networked_Graphics_MV3500_examples
+dist.jar=${dist.dir}/${dist.name}.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+project.licensePath=../license.txt
+viskit.proj.dir=ViskitOpenDis7Examples
+viskit.proj.lib.dir=src/${viskit.proj.dir}/lib
+opendis.helper=SimkitOpenDis7Examples.run.OpenDisHelper
+excludes=ViskitOpenDis7Examples/
+file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar
+file.reference.opendis7-full.jar=../lib/opendis7-full.jar
+file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar
+file.reference.simkit-doc.zip=../lib/simkit-doc.zip
+file.reference.simkit-src.zip=../lib/simkit-src.zip
+file.reference.simkit.jar=../lib/simkit.jar
+#file.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-classes.jar
+#file.reference.opendis7-pdus-classes.jar=../lib/opendis7-pdus-classes.jar
+includes=**/*.java
+jar.compress=false
+javac.classpath=\
+    ${file.reference.opendis7-full.jar}:\
+    ${file.reference.open-dis_4.16.jar}:\
+    ${file.reference.dis-enums-1.3.jar}:\
+    ${file.reference.simkit.jar}:\
+    ${file.reference.simkit-doc.zip}:\
+    ${file.reference.simkit-src.zip}
+#   ${file.reference.opendis7-enumerations-classes.jar}:\
+#   ${file.reference.opendis7-pdus-classes.jar}:\
+
+# Space-separated list of extra javac options
+javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
+javac.deprecation=false
+javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=17
+javac.target=17
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=-header "NPS Networked Graphics MV3500 Examples"
+javadoc.author=true
+javadoc.encoding=${source.encoding}
+javadoc.html5=false
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+#javadoc.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-javadoc.jar
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=MV3500 Examples
+jlink.launcher=false
+jlink.launcher.name=Networked_Graphics_MV3500_examples
+main.class=TcpExamples.TcpExample1Telnet
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+source.encoding=UTF-8
+#source.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-source.jar
+src.dir=src
+src.src.dir=otherProjects\\DisDemo\\src
+src.src2.dir=otherProjects\\DisShooting\\src
+src.src3.dir=otherProjects\\WebSocketGateway\\src
+#src.src4.dir=otherProjects\\BasicServletDemo\\src
diff --git a/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar b/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/examples/src/ViskitOpenDis7Examples/viskitProject.xml b/examples/src/ViskitOpenDis7Examples/viskitProject.xml
index 40d1e0f7e868ab0240bdff6ad8966c593f5e5f0f..dceef140ca16d4e6429c495d8a560bbdaaea9ade 100644
--- a/examples/src/ViskitOpenDis7Examples/viskitProject.xml
+++ b/examples/src/ViskitOpenDis7Examples/viskitProject.xml
@@ -12,4 +12,4 @@
   <Cached />
   <extraClassPaths>
   </extraClassPaths>
-</ViskitProject>
\ No newline at end of file
+</ViskitProject>
diff --git a/presentations/11a_Certificates_PKI.ppt b/presentations/11a_Certificates_PKI.ppt
index 3c174dce6fbc1e57945d7f2e379eaf7e0b70e2b2..b218f556532453a4d22f1a617ba483b2ab1a2966 100644
Binary files a/presentations/11a_Certificates_PKI.ppt and b/presentations/11a_Certificates_PKI.ppt differ
diff --git a/presentations/11b_SimulationAsAService.ppt b/presentations/11b_SimulationAsAService.ppt
index e2bf9e4991fd8192b7733a221554550cf6aeb50e..b76f34c92cd940d951c1264c46655f54147d8614 100644
Binary files a/presentations/11b_SimulationAsAService.ppt and b/presentations/11b_SimulationAsAService.ppt differ
diff --git a/presentations/11c_Clouds_Virtualization.ppt b/presentations/11c_Clouds_Virtualization.ppt
index f9fb5b7a78bd6af53ce0383a5ffec5cfac1b6e3a..74c91857f154892c5f4a5f03f4475470fd64195f 100644
Binary files a/presentations/11c_Clouds_Virtualization.ppt and b/presentations/11c_Clouds_Virtualization.ppt differ
diff --git a/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/TransferLineComponent.xml b/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/TransferLineComponent.xml
deleted file mode 100644
index c9e8ddec9b611c19ffb4524e41bda0e529db23c9..0000000000000000000000000000000000000000
--- a/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/TransferLineComponent.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimEntity name="TransferLineComponent" package="examples" version="0.0.2" extend="SimEntityBase" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <Comment>TODO: Fix me, I'm currently broken!! tdn 8/29/24</Comment>
-    <Parameter name="totalNumberServers" type="int[]"/>
-    <Parameter name="serviceTime" type="simkit.random.RandomVariate[]"/>
-    <StateVariable name="numberAvailableServers" type="int[totalNumberServers.length]"/>
-    <StateVariable name="numberInQueue" type="int[totalNumberServers.length]"/>
-    <Event name="Run">
-        <LocalVariable name="j" type="int" value="0">
-            <Comment></Comment>
-        </LocalVariable>
-        <StateTransition state="numberAvailableServers" index="j>
-            <Assignment value="totalNumberServers[j]"/>
-        </StateTransition>
-        <StateTransition state="numberInQueue" index="_idxvar_1">
-            <Assignment value="0"/>
-        </StateTransition>
-        <Schedule delay="0.0" event="InitializeWorkcenter" priority="DEFAULT">
-            <EdgeParameter value="0"/>
-        </Schedule>
-        <Coordinate x="0.0" y="0.0"/>
-    </Event>
-    <Event name="InitializeWorkcenter">
-        <Argument name="i" type="int"/>
-        <StateTransition state="numberInQueue" index="_idxvar_26">
-            <Assignment value="0"/>
-        </StateTransition>
-        <StateTransition state="numberAvailableServers" index="_idxvar_27">
-            <Assignment value="totalNumberServers[i]"/>
-        </StateTransition>
-        <Schedule event="InitializeWorkcenter" condition="i &lt; totalNumberServers.length - 1" priority="DEFAULT">
-            <EdgeParameter value="i+1"/>
-        </Schedule>
-        <Coordinate x="120.0" y="0.0"/>
-    </Event>
-    <Event name="Arrival">
-        <Argument name="i" type="int"/>
-        <StateTransition state="numberInQueue" index="_idxvar_47">
-            <Assignment value="numberInQueue[i] + 1"/>
-        </StateTransition>
-        <Schedule event="StartService" condition="getNumberAvailableServers(i) &gt; 0" priority="DEFAULT">
-            <EdgeParameter value="i"/>
-        </Schedule>
-        <Coordinate x="0.0" y="180.0"/>
-    </Event>
-    <Event name="StartService">
-        <Argument name="i" type="int"/>
-        <StateTransition state="numberInQueue" index="_idxvar_48">
-            <Assignment value="numberInQueue[i] + 1"/>
-        </StateTransition>
-        <StateTransition state="numberAvailableServers" index="_idxvar_49">
-            <Assignment value="numberAvailableServers[i] - 1"/>
-        </StateTransition>
-        <Schedule delay="serviceTime[i].generate()" event="EndService" priority="DEFAULT">
-            <EdgeParameter value="i"/>
-        </Schedule>
-        <Coordinate x="160.0" y="100.0"/>
-    </Event>
-    <Event name="EndService">
-        <Argument name="i" type="int"/>
-        <StateTransition state="numberAvailableServers" index="_idxvar_50">
-            <Assignment value="numberAvailableServers[i]+1"/>
-        </StateTransition>
-        <Schedule event="StartService" condition="getNumberInQueue(i) &gt; 0" priority="DEFAULT"/>
-        <Schedule event="Arrival" condition="i &lt; totalNumberServers.length - 1" priority="DEFAULT"/>
-        <Coordinate x="330.0" y="200.0"/>
-    </Event>
-</SimEntity>
diff --git a/viskit/MyViskitProjects/DefaultProject/viskitProject.xml b/viskit/MyViskitProjects/DefaultProject/viskitProject.xml
index 2c559b5ae10acad72b382aa05802a5cb304d07ed..8e72b801eacbcecdc845a41a0612d0e51a472132 100644
--- a/viskit/MyViskitProjects/DefaultProject/viskitProject.xml
+++ b/viskit/MyViskitProjects/DefaultProject/viskitProject.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViskitProject>
-  <AnalystReports name="AnalystReports" />
-  <AssembliesDirectory name="Assemblies" />
-  <EventGraphsDirectory name="EventGraphs" />
-  <BuildDirectory name="build">
-    <ClassesDirectory name="classes" />
-    <SourceDirectory name="src" />
-  </BuildDirectory>
-  <DistDirectory name="dist" />
-  <LibDirectory name="lib" />
-  <Cached>
-  </Cached>
-  <extraClassPaths>
-  </extraClassPaths>
-</ViskitProject>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<ViskitProject>
+  <AnalystReports name="AnalystReports"/>
+  <AssembliesDirectory name="Assemblies"/>
+  <EventGraphsDirectory name="EventGraphs"/>
+  <BuildDirectory name="build">
+    <ClassesDirectory name="classes"/>
+    <SourceDirectory name="src"/>
+  </BuildDirectory>
+  <DistDirectory name="dist"/>
+  <LibDirectory name="lib"/>
+  <Cached>
+  </Cached>
+  <extraClassPaths>
+  </extraClassPaths>
+</ViskitProject>
diff --git a/viskit/configuration/c_app.xml b/viskit/configuration/c_app.xml
index bfa3ce358d8ae2ad2bbe0c44974a9f1f5fa6da43..8e0a01435f326eba946a8155cba7309ea5e846ef 100644
--- a/viskit/configuration/c_app.xml
+++ b/viskit/configuration/c_app.xml
@@ -13,7 +13,8 @@
         </mainframe>
         <projecthome>
             <!-- These two attributes MUST always be at least zero-length Strings -->
-            <!-- DefaultProject is included in this template for convenience -->
+            <!-- A default project path and name (DefaultProject) are included 
+                 in this template for convenience -->
             <path dir="../examples/src"/>
             <name value="ViskitOpenDis7Examples"/>
         </projecthome>
diff --git a/viskit/lib/viskit.jar b/viskit/lib/viskit.jar
index af047761bc02b6e9dfca417efcbdc9b54e051db0..48e7797ce2ba7e0732b08e1b08aae80f7be9e769 100644
Binary files a/viskit/lib/viskit.jar and b/viskit/lib/viskit.jar differ