diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index fc1639343..6ec71f2e9 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -5845,6 +5845,9 @@
     <CAbilEffectTarget id="AP_FeedbackArchon" parent="AP_Feedback">
         <CmdButtonArray index="Execute" Requirements="AP_HaveHighArchon"/>
     </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_FeedbackSignifier" parent="AP_Feedback">
+        <CmdButtonArray index="Execute" Requirements="AP_HaveSignifierFeedback"/>
+    </CAbilEffectTarget>
     <CAbilEffectTarget id="AP_FeedbackDarkArchon" parent="AP_Feedback">
         <CmdButtonArray index="Execute" Requirements="AP_HaveDarkArchonFeedback"/>
     </CAbilEffectTarget>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 196bad389..c8987f153 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -14881,7 +14881,7 @@
         <On index="65" Send="AnimBracketStart Attack Spell,A"/>
         <On Terms="Abil.AP_PsiStormShakuras.SourceCastStart" Send="AnimPlay A A"/>
         <On Terms="Abil.AP_PhaseShift.SourceCastStart" Send="AnimPlay B B"/>
-        <On Terms="Abil.AP_Feedback.SourceCastStart" Send="AnimPlay B B"/>
+        <On Terms="Abil.AP_FeedbackSignifier.SourceCastStart" Send="AnimPlay B B"/>
         <On Terms="Abil.AP_PlasmaSurge.SourceCastStart" Send="AnimPlay B B"/>
         <On Terms="Abil.AP_Vortex.SourceCastStart" Send="AnimPlay A A"/>
         <On Terms="Abil.AP_TemporalRift.SourceCastStart" Send="AnimPlay A A"/>
@@ -15046,6 +15046,7 @@
     <CActorRange id="AP_PsiStormRange" parent="RangeAbil" abil="AP_PsiStorm"/>
     <CActorRange id="AP_FeedbackRange" parent="RangeAbil" abil="AP_Feedback"/>
     <CActorRange id="AP_FeedbackArchonRange" parent="RangeAbil" abil="AP_FeedbackArchon"/>
+    <CActorRange id="AP_FeedbackSignifierRange" parent="RangeAbil" abil="AP_FeedbackSignifier"/>
     <CActorRange id="AP_FeedbackDarkArchonRange" parent="RangeAbil" abil="AP_FeedbackDarkArchon"/>
     <CActorRange id="AP_HighTemplarSCBWHallucinationRange" parent="RangeAbil" abil="AP_HighTemplarSCBWHallucination"/>
     <CActorRange id="AP_HighTemplarSCBWHallucinationHighArchonRange" parent="RangeAbil" abil="AP_HighTemplarSCBWHallucinationHighArchon"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 7084692ce..393136046 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3138,6 +3138,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Use" Link="AP_CountUpgradeHighTemplarPlasmaSurgeCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveSignifierFeedback">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeSignifierFeedbackCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveDarkArchonMeld">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeDarkArchonMeldCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index e252f6b28..d84cf23ca 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5499,6 +5499,10 @@
         <Count Link="AP_HighTemplarPlasmaSurge" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeSignifierFeedbackCompleteOnly">
+        <Count Link="AP_SignifierFeedback" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeDarkArchonMeldCompleteOnly">
         <Count Link="AP_DarkArchonMeld" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 8ea289282..b5b1d5311 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -14238,7 +14238,7 @@
         <AbilArray Link="AP_ArchonWarp"/>
         <AbilArray Link="Warpable"/>
         <AbilArray Link="ProgressRally"/>
-        <AbilArray Link="AP_Feedback"/>
+        <AbilArray Link="AP_FeedbackSignifier"/>
         <AbilArray Link="BuildInProgress"/>
         <AbilArray Link="attack"/>
         <AbilArray Link="AP_HighTemplarSCBWHallucination"/>
@@ -14255,7 +14255,7 @@
             <LayoutButtons Face="AcquireMove" Type="AbilCmd" AbilCmd="move,AcquireMove" Row="0" Column="4"/>
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
             <LayoutButtons Face="AP_AWrp" Type="AbilCmd" AbilCmd="AP_ArchonWarp,SelectedUnits" Row="2" Column="3"/>
-            <LayoutButtons Face="AP_Feedback" Type="AbilCmd" AbilCmd="AP_Feedback,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_Feedback" Type="AbilCmd" AbilCmd="AP_FeedbackSignifier,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_CripplingPsionicStorm" Type="AbilCmd" AbilCmd="AP_PsiStormShakuras,0" Row="2" Column="1"/>
             <LayoutButtons Face="AP_VoidHighTemplarPsiStormCripple" Type="Passive" Row="1" Column="1"/>
             <LayoutButtons Face="AP_VoidHighTemplarCloak" Type="Passive" Row="1" Column="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 49a385eea..430b342dc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11778,6 +11778,7 @@
         <EffectArray Reference="Unit,AP_Archon,EnergyStart" Value="150"/>
         <EffectArray Reference="Unit,AP_Archon,EnergyMax" Value="50"/>
     </CUpgrade>
+    <CUpgrade id="AP_SignifierFeedback"/>
     <CUpgrade id="AP_DarkArchonMeld"/>
     <CUpgrade id="AP_DarkArchonFeedback"/>
     <CUpgrade id="AP_DarkArchonMaelstrom"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 93a655e2e..d7a5be507 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -4758,6 +4758,7 @@ RequirementNode/Tooltip/AP_CountUpgradeHighTemplarPlasmaSurgeCompleteOnly=Find P
 RequirementNode/Tooltip/AP_CountUpgradeImmortalImprovedBarrierCompleteOnly=Find Improved Barrier (Immortal)
 RequirementNode/Tooltip/AP_CountUpgradeMirageGravitonBeamCompleteOnly=Find Graviton Beam (Mirage)
 RequirementNode/Tooltip/AP_CountUpgradeReaverKhalaiReplicatorsCompleteOnly=Find Khalai Replicators (Reaver)
+RequirementNode/Tooltip/AP_CountUpgradeSignifierFeedbackCompleteOnly=Find Feedback (Signifier)
 RequirementNode/Tooltip/AP_CountUpgradeSkirmisherPeerContemptCompleteOnly=Find Peer Contempt (Skirmisher)
 RequirementNode/Tooltip/AP_CountUpgradeSkylordHyperjumpCompleteOnly=Find Hyperjump (Skylord)
 RequirementNode/Tooltip/AP_CountUpgradeSlayerBlinkCompleteOnly=Find Phase Blink (Slayer)
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 576d88a84..5a12e742e 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1558,7 +1558,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil (int lp_player, int lp_b
         libABFE498B_gf_AP_Triggers_Protoss_unlockEnergizerMobileChronoBeam, // 13
         libABFE498B_gf_AP_Triggers_Protoss_unlockHavocEnduringSight, // 14
         libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge, // 15
-        ap_triggers_PlayerConsumer_sig, // 16
+        libABFE498B_gf_AP_Triggers_Protoss_unlockSignifierFeedback, // 16
         libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantAbilityEfficiency, // 17
         libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonIndomitableWill, // 18
         libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalImprovedBarrier, // 19
@@ -7526,6 +7526,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonHighArchon (int lp_player) {
     }
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockSignifierFeedback (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SignifierFeedback", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonFeedback (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 46f191c8d..108102e12 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -781,6 +781,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarSignifierHallucination
 void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarSignifierKhaydarinAmulet (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonHighArchon (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockSignifierFeedback (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonFeedback (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonMaelstrom (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonArgusTalisman (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 40495f71f..73b5ba766 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4565,7 +4565,7 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockEnergizerMobileChronoBeam, // 13
                     libABFE498B_gf_AP_Triggers_Protoss_unlockHavocEnduringSight, // 14
                     libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge, // 15
-                    ap_triggers_PlayerConsumer_sig, // 16
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockSignifierFeedback, // 16
                     libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantAbilityEfficiency, // 17
                     libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonIndomitableWill, // 18
                     libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalImprovedBarrier, // 19
@@ -59407,6 +59407,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="90C1FDDC"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="92E7D1F2"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="788DDD18"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="A164D27E"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D4116829"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="1677C710"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="34A84A24"/>
@@ -63272,6 +63273,43 @@
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionDef" Id="A164D27E">
+            <Identifier>AP_Triggers_Protoss_unlockSignifierFeedback</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="1828C086"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="02C4B7C7"/>
+        </Element>
+        <Element Type="ParamDef" Id="1828C086">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="9CE2D49C"/>
+        </Element>
+        <Element Type="Param" Id="9CE2D49C">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="02C4B7C7">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="5C330DF7"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="21D8189B"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="2C2B783A"/>
+        </Element>
+        <Element Type="Param" Id="5C330DF7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="1828C086"/>
+        </Element>
+        <Element Type="Param" Id="21D8189B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_SignifierFeedback</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="2C2B783A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="D4116829">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="F52C291B"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 8265e091f..6ebde9687 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -576,6 +576,7 @@ FunctionDef/Name/lib_ABFE498B_A001B908=AP_Triggers_Terran_unlockFirebatIncinerat
 FunctionDef/Name/lib_ABFE498B_A00F5123=AP_Triggers_Zerg_TyrannozorBarrageofSpikes
 FunctionDef/Name/lib_ABFE498B_A047E206=AP_Triggers_Zerg_BroodQueenEnhancedMitochondria
 FunctionDef/Name/lib_ABFE498B_A07C1E0D=AP_Triggers_Protoss_unlockAnnihilatorAerialTracking
+FunctionDef/Name/lib_ABFE498B_A164D27E=AP_Triggers_Protoss_unlockSignifierFeedback
 FunctionDef/Name/lib_ABFE498B_A232CDB3=AP_Triggers_Zerg_unlockRavager
 FunctionDef/Name/lib_ABFE498B_A3C2AAD9=AP_Triggers_Zerg_KerriganSpawnBanelings
 FunctionDef/Name/lib_ABFE498B_A46848D1=AP_Triggers_unlockZergMercenaries
@@ -928,6 +929,7 @@ ParamDef/Name/lib_ABFE498B_170BAC8C=player
 ParamDef/Name/lib_ABFE498B_17120B49=player
 ParamDef/Name/lib_ABFE498B_17C9563D=player
 ParamDef/Name/lib_ABFE498B_17FF7EA9=player
+ParamDef/Name/lib_ABFE498B_1828C086=player
 ParamDef/Name/lib_ABFE498B_184AA933=player
 ParamDef/Name/lib_ABFE498B_1861A72D=player
 ParamDef/Name/lib_ABFE498B_18CC934D=player