diff --git a/pack/gmw.json b/pack/gmw.json
index 276f6532..100da298 100644
--- a/pack/gmw.json
+++ b/pack/gmw.json
@@ -1357,87 +1357,5 @@
 		"set_position": 5,
 		"text": "<b>Expert Mode Only.</b>\nHinder 4[per_hero]. Victory 1.",
 		"type_code": "side_scheme"
-	},
-	{
-		"attack": 1,
-		"boost_text": "Put Badoon Headhunter into play engaged with you.",
-		"code": "16183",
-		"faction_code": "campaign",
-		"health": 7,
-		"name": "Badoon Headhunter",
-		"octgn_id": "4b58fa91-6add-4cd1-a585-b325d9e5c883",
-		"pack_code": "gmw",
-		"position": 183,
-		"quantity": 1,
-		"scheme": 1,
-		"set_code": "badoon_headhunter",
-		"set_position": 1,
-		"text": "Victory 2. <i>(When defeated, add this card to the victory display.)</i>\nVillainous. <i>(When this minion activates, give it a boost card.)</i>",
-		"traits": "Badoon.",
-		"type_code": "minion"
-	},
-	{
-		"boost": 1,
-		"boost_text": "Give the villain 1 additional boost card for this activation.",
-		"code": "16184",
-		"faction_code": "campaign",
-		"name": "On the Hunt",
-		"octgn_id": "ae01075c-da48-413c-9bfc-0588983a8bd8",
-		"pack_code": "gmw",
-		"position": 184,
-		"quantity": 1,
-		"set_code": "badoon_headhunter",
-		"set_position": 2,
-		"text": "Surge.\n<b>When Revealed</b>: Choose to either take 2 damage or discard 1 card at random from your hand.",
-		"type_code": "treachery"
-	},
-	{
-		"boost": 1,
-		"boost_text": "Give the villain 1 additional boost card for this activation.",
-		"code": "16185",
-		"faction_code": "campaign",
-		"name": "Dead to Rights",
-		"octgn_id": "c6f38aa9-d315-4e9f-acb2-8a5d71e72170",
-		"pack_code": "gmw",
-		"position": 185,
-		"quantity": 1,
-		"set_code": "badoon_headhunter",
-		"set_position": 3,
-		"text": "Surge.\n<b>When Revealed</b>: Exhaust your identity. If you cannot, place 2 threat on the main scheme.",
-		"type_code": "treachery"
-	},
-	{
-		"attack": 2,
-		"boost": 3,
-		"code": "16186",
-		"faction_code": "campaign",
-		"health": 8,
-		"name": "Headhunter's Henchman",
-		"octgn_id": "9f551569-2827-4d7e-b75f-f4f829d788af",
-		"pack_code": "gmw",
-		"position": 186,
-		"quantity": 1,
-		"scheme": 1,
-		"set_code": "badoon_headhunter",
-		"set_position": 4,
-		"text": "Surge. Patrol. <i>(While this minion is engaged with you, you cannot thwart the main scheme.)</i>",
-		"traits": "Badoon.",
-		"type_code": "minion"
-	},
-	{
-		"base_threat": 0,
-		"boost": 3,
-		"code": "16187",
-		"faction_code": "campaign",
-		"name": "Fugitive Recovery",
-		"octgn_id": "8c8feb01-4614-4c85-8c68-cb4682ca672a",
-		"pack_code": "gmw",
-		"position": 187,
-		"quantity": 1,
-		"scheme_crisis": 1,
-		"set_code": "badoon_headhunter",
-		"set_position": 5,
-		"text": "Surge.\nHinder 3[per_hero]. <i>(When revealed, place 3[per_hero] threat here.)</i>",
-		"type_code": "side_scheme"
 	}
 ]
diff --git a/pack/gmw_encounter.json b/pack/gmw_encounter.json
index c20ac8d4..f9b6c854 100644
--- a/pack/gmw_encounter.json
+++ b/pack/gmw_encounter.json
@@ -1972,5 +1972,88 @@
 		"text": "Setup. Attach to the villain.\nPermanent.\n<b>Forced Response:</b> After a hero or villain deals 3 or more damage to attached character with a single attack, attach Power Stone to the attacking hero or villain.",
 		"traits": "Infinity Stone.",
 		"type_code": "attachment"
+	},
+	{
+		"attack": 1,
+		"boost_text": "Put Badoon Headhunter into play engaged with you.",
+		"code": "16183",
+		"faction_code": "encounter",
+		"health": 7,
+		"name": "Badoon Headhunter",
+		"octgn_id": "4b58fa91-6add-4cd1-a585-b325d9e5c883",
+		"pack_code": "gmw",
+		"position": 183,
+		"quantity": 1,
+		"scheme": 1,
+		"set_code": "badoon_headhunter",
+		"set_position": 1,
+		"text": "Victory 2. <i>(When defeated, add this card to the victory display.)</i>\nVillainous. <i>(When this minion activates, give it a boost card.)</i>",
+		"traits": "Badoon.",
+		"type_code": "minion"
+	},
+	{
+		"boost": 1,
+		"boost_text": "Give the villain 1 additional boost card for this activation.",
+		"code": "16184",
+		"faction_code": "encounter",
+		"name": "On the Hunt",
+		"octgn_id": "ae01075c-da48-413c-9bfc-0588983a8bd8",
+		"pack_code": "gmw",
+		"position": 184,
+		"quantity": 1,
+		"set_code": "badoon_headhunter",
+		"set_position": 2,
+		"text": "Surge.\n<b>When Revealed</b>: Choose to either take 2 damage or discard 1 card at random from your hand.",
+		"type_code": "treachery"
+	},
+	{
+		"boost": 1,
+		"boost_text": "Give the villain 1 additional boost card for this activation.",
+		"code": "16185",
+		"faction_code": "encounter",
+		"name": "Dead to Rights",
+		"octgn_id": "c6f38aa9-d315-4e9f-acb2-8a5d71e72170",
+		"pack_code": "gmw",
+		"position": 185,
+		"quantity": 1,
+		"set_code": "badoon_headhunter",
+		"set_position": 3,
+		"text": "Surge.\n<b>When Revealed</b>: Exhaust your identity. If you cannot, place 2 threat on the main scheme.",
+		"type_code": "treachery"
+	},
+	{
+		"attack": 2,
+		"boost": 3,
+		"code": "16186",
+		"faction_code": "encounter",
+		"health": 8,
+		"name": "Headhunter's Henchman",
+		"octgn_id": "9f551569-2827-4d7e-b75f-f4f829d788af",
+		"pack_code": "gmw",
+		"position": 186,
+		"quantity": 1,
+		"scheme": 1,
+		"set_code": "badoon_headhunter",
+		"set_position": 4,
+		"text": "Surge.\nPatrol. <i>(While this minion is engaged with you, you cannot thwart the main scheme.)</i>",
+		"traits": "Badoon.",
+		"type_code": "minion"
+	},
+	{
+		"base_threat": 2,
+		"base_threat_fixed": true,
+		"boost": 3,
+		"code": "16187",
+		"faction_code": "encounter",
+		"name": "Fugitive Recovery",
+		"octgn_id": "8c8feb01-4614-4c85-8c68-cb4682ca672a",
+		"pack_code": "gmw",
+		"position": 187,
+		"quantity": 1,
+		"scheme_crisis": 1,
+		"set_code": "badoon_headhunter",
+		"set_position": 5,
+		"text": "Surge.\nHinder 3[per_hero]. <i>(When revealed, place 3[per_hero] threat here.)</i>",
+		"type_code": "side_scheme"
 	}
 ]