diff --git a/src/main/java/frc/robot/subsystems/Drive.java b/src/main/java/frc/robot/subsystems/Drive.java
index e74a693..7b8458c 100644
--- a/src/main/java/frc/robot/subsystems/Drive.java
+++ b/src/main/java/frc/robot/subsystems/Drive.java
@@ -180,17 +180,12 @@ public Command aimAtReefCenter() {
     //
 
     public void filterReefTags() {
+        var reef = getOurReef();
         for (var key : visionData.targets.keySet()) {
-            if (isBlueAlliance) {
-                if (key < 6 || key > 11) {
-                    visionData.targets.remove(key);
-                }
-                // Pull in keySet from targets HashMap
-                // Remove all IDs / keys which aren't blue reef
-            } else {
-                if (key < 17 || key > 22) {
-                    visionData.targets.remove(key);
-                }
+            // Pull in keySet from targets HashMap
+            // Remove all IDs / keys which aren't our reef
+            if (reef.keySet().contains(key)) {
+                visionData.targets.remove(key);
             }
         }
     }