diff --git a/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs b/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs
index 071d5dc..2ecb529 100644
--- a/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs
+++ b/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs
@@ -120,7 +120,7 @@ namespace Nox.Game {
             timeHandler ??= new TimeHandler(adventureSettings, adventureData, worldClock);
 
             zoneSystem ??= new ZoneSystem(mapRef.zonesObjectHolder);
-            encounterHandler = new EncounterHandler(zoneSystem, encounterRegistry, encounterPrefabs, adventureData);
+            encounterHandler = new EncounterHandler(zoneSystem, encounterRegistry, encounterPrefabs);
             partyMovementHandler ??= new PartyMovementHandler(
                 partyRef,
                 cameraController,
diff --git a/Assets/Code/GameState/PlayModes/Encounters/EncounterHandler.cs b/Assets/Code/GameState/PlayModes/Encounters/EncounterHandler.cs
index b120959..72d2000 100644
--- a/Assets/Code/GameState/PlayModes/Encounters/EncounterHandler.cs
+++ b/Assets/Code/GameState/PlayModes/Encounters/EncounterHandler.cs
@@ -6,15 +6,12 @@ namespace Nox.Game {
     public class EncounterHandler {
         private readonly ZoneSystem zoneSystem;
         private readonly EncounterRegistry encounterRegistry;
-        private readonly AdventureData adventureData;
         private readonly EncounterView encounterView;
         private string previousZoneId;
-        private int previousDay;
 
-        public EncounterHandler(ZoneSystem zoneSystem, EncounterRegistry encounterRegistry, EncounterPrefabs encounterPrefabs, AdventureData adventureData) {
+        public EncounterHandler(ZoneSystem zoneSystem, EncounterRegistry encounterRegistry, EncounterPrefabs encounterPrefabs) {
             this.zoneSystem = zoneSystem;
             this.encounterRegistry = encounterRegistry;
-            this.adventureData = adventureData;
             encounterView = new EncounterView(encounterPrefabs);
         }
 
@@ -62,7 +59,7 @@ namespace Nox.Game {
             if(currentZoneId != previousZoneId) {
                 if(!string.IsNullOrEmpty(currentZoneId)) {
                     Debug.Log($"Entered zone: {currentZoneId} (encounter: {zoneContext.encounterTableId}, safe: {zoneContext.isSafe})");
-                    if(ResolveEncounter(zoneContext, currentZoneId, out var encounter)) {
+                    if(ResolveEncounter(zoneContext, zoneContext.encounterTableId, out var encounter)) {
                         TriggerEncounter(encounter);
                     }
 
@@ -86,9 +83,7 @@ namespace Nox.Game {
         }
 
         public void CheckForEncounters(Vector3 position) {
-            if (adventureData.currentDay != previousDay) {
-                VerifyZones(position);
-            }
+            VerifyZones(position);
         }
 
         public void Tick() { }
diff --git a/Assets/Code/GameState/PlayModes/PartyMovementHandler.cs b/Assets/Code/GameState/PlayModes/PartyMovementHandler.cs
index 57737e8..37250fa 100644
--- a/Assets/Code/GameState/PlayModes/PartyMovementHandler.cs
+++ b/Assets/Code/GameState/PlayModes/PartyMovementHandler.cs
@@ -17,7 +17,6 @@ namespace Nox.Game {
         private Vector3 targetPosition;
         private bool shouldHover;
         private MapLocation currentSelectedPoi;
-        private string previousZoneId;
         private bool hasClicked;
         private bool skipNextClick;
 
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 0da9076..d7a09c8 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -74,12 +74,6 @@
         "com.unity.nuget.newtonsoft-json": "3.2.1"
       }
     },
-    "com.jovian.tag-system": {
-      "version": "file:com.jovian.tag-system",
-      "depth": 0,
-      "source": "embedded",
-      "dependencies": {}
-    },
     "com.jovian.unitypackagesync": {
       "version": "file:com.jovian.unitypackagesync",
       "depth": 0,