diff --git a/ees/scenarios/grid/ar-1b-ees-fire.xml b/ees/scenarios/grid/ar-1b-ees-fire.xml
new file mode 100644
index 00000000..f66eaa86
--- /dev/null
+++ b/ees/scenarios/grid/ar-1b-ees-fire.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+ 12345
+
+ EPSG:28355
+
+ 00:01
+
+
+
+
+
+
+
+ FIRST
+
+ WARN
+ test/output/io/github/agentsoz/ees/agents/archetype/ArchetypeAgentFireTestNewMode/test/archetype.log
+ test/output/io/github/agentsoz/ees/agents/archetype/ArchetypeAgentFireTestNewMode/test/archetype.out
+
+
+ test/output/io/github/agentsoz/ees/agents/archetype/ArchetypeAgentFireTestNewMode/test/archetype.metrics.json
+
+ 600
+
+
+
+
+ test/output/io/github/agentsoz/ees/agents/archetype/ArchetypeAgentFireTestNewMode/test/matsim
+
+ scenarios/grid/ar-1b-mat.xml
+
+ 1000
+
+ 0
+
+ 2000
+
+ 1000
+
+ 180
+ 0.33
+ 0.0
+
+
+
+
+ 01:00
+
+ scenarios/grid/gridfire.json
+
+ 180
+
+
+
+
+
diff --git a/ees/scenarios/grid/ar-1b-mat.xml b/ees/scenarios/grid/ar-1b-mat.xml
new file mode 100644
index 00000000..7f822002
--- /dev/null
+++ b/ees/scenarios/grid/ar-1b-mat.xml
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ees/scenarios/grid/ar-1b-pop.xml b/ees/scenarios/grid/ar-1b-pop.xml
new file mode 100644
index 00000000..ade2f81c
--- /dev/null
+++ b/ees/scenarios/grid/ar-1b-pop.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+ 80
+ 202021028P223
+ Considered.Evacuator
+ 75 years +
+ Couple without dependents living at home
+ io.github.agentsoz.ees.agents.archetype.ArchetypeAgent
+ 17 BUCKLEY STREET HARCOURT 3453
+ FarFarAway,5000.0,0000.0
+ Male
+ [144.2623, -36.9993]
+ false
+
+ 202021028H1439
+ 3186
+ 0.1
+ 0.4
+ 0.4
+ 0.6
+ 0.7
+ 0.2
+ 0.5
+ 0.5
+ 0.5
+ 0.6
+ 0.4
+ 0.3
+ NotSoFarAway,2500.0,2500.0
+ 5.89
+ 17.89
+ COUPLE_ONLY
+ 0.38
+ -0.02
+ 2102819
+ 202021028
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ees/scenarios/grid/gridworld.xml b/ees/scenarios/grid/gridworld.xml
index b6433f7e..d1a8be09 100644
--- a/ees/scenarios/grid/gridworld.xml
+++ b/ees/scenarios/grid/gridworld.xml
@@ -64,150 +64,150 @@ Link speeds (kmph) decrease from left to right as: 110,100,80,60,50,40.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ees/src/test/java/io/github/agentsoz/ees/agents/archetype/ArchetypeAgentFireTestNewMode.java b/ees/src/test/java/io/github/agentsoz/ees/agents/archetype/ArchetypeAgentFireTestNewMode.java
new file mode 100644
index 00000000..f7913f90
--- /dev/null
+++ b/ees/src/test/java/io/github/agentsoz/ees/agents/archetype/ArchetypeAgentFireTestNewMode.java
@@ -0,0 +1,52 @@
+
+package io.github.agentsoz.ees.agents.archetype;
+
+/*-
+ * #%L
+ * Emergency Evacuation Simulator
+ * %%
+ * Copyright (C) 2014 - 2024 by its authors. See AUTHORS file.
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * .
+ * #L%
+ */
+
+import io.github.agentsoz.ees.Run;
+import org.junit.Rule;
+import org.junit.Test;
+import org.matsim.testcases.MatsimTestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author dsingh
+ *
+ */
+public class ArchetypeAgentFireTestNewMode {
+
+ // have tests in separate classes so that they run, at least under maven, in separate JVMs. kai, nov'17
+
+ private static final Logger log = LoggerFactory.getLogger(ArchetypeAgentFireTestNewMode.class);
+
+ @Rule
+ public MatsimTestUtils matsimUtils = new MatsimTestUtils();
+
+ @Test
+ public void test() {
+ matsimUtils.getOutputDirectory(); // creates a clean one so need to call this first
+ Run.main(new String[] {"--config", "scenarios/grid/ar-1b-ees-fire.xml"});
+ }
+}
+
diff --git a/libs/bdi-abm-integration b/libs/bdi-abm-integration
index 2035598c..fc53117b 160000
--- a/libs/bdi-abm-integration
+++ b/libs/bdi-abm-integration
@@ -1 +1 @@
-Subproject commit 2035598c2f1a5c9b7a7079e189886782fe67a2d4
+Subproject commit fc53117badd12b990da018d0b2e29aee98774e6e