diff --git a/python/python/model/feature_extractor.py b/python/python/model/feature_extractor.py
index 4c72127..04be183 100644
--- a/python/python/model/feature_extractor.py
+++ b/python/python/model/feature_extractor.py
@@ -1,4 +1,4 @@
-"""Extract NNUE features from FEN strings - EXACT Stockfish implementation"""
+"""Extract NNUE features from FEN strings - EXACT Stockfish Implementation"""
 
 import chess
 from chess import Board as chess_board
@@ -10,34 +10,56 @@ from python.constants import (
     PIECE_SQUARE_INDEX,
 )
 
-# Stockfish NNUE exact encoding
-# FullThreats: Index = lut1[attacker][attacked][from<to] + offsets[from] + lut2[from][to]
+# Stockfish NNUE constants (from full_threats.h)
+PIECE_NB = 12  # Number of piece types (6 white + 6 black)
+PIECE_TYPE_NB = 6  # Number of piece types (pawn, knight, bishop, rook, queen, king)
 
-# Simplified Stockfish encoding:
-# - Piece index: piece_sq * 6 + piece_type (0-383)
-# - FullThreats index: piece1_idx * 157 + piece2_idx
-# - Max: 383 * 157 + 383 = 60,514 (close to 60,720)
-# - The difference is handled by using a different multiplier for certain cases
+numValidTargets = [
+    0,
+    6,
+    10,
+    8,
+    8,
+    10,
+    8,  # White pieces
+    0,
+    6,
+    10,
+    8,
+    8,
+    10,
+    8,
+]  # Black pieces
 
-# Actually, Stockfish uses a more complex formula:
-# Index = (from_sq * 6 + from_type) * 64 + (to_sq * 6 + to_type)
-# But this only gives 24,591 features, not 60,720
+# Piece type to index mapping (0 = pawn, 1 = knight, etc.)
+TYPE_TO_INDEX = {
+    "\u2659": 0,  # B_PAWN
+    "\u2658": 1,  # B_KNIGHT
+    "\u2657": 2,  # B_BISHOP
+    "\u2656": 3,  # B_ROOK
+    "\u2655": 4,  # B_QUEEN
+    "\u2654": 5,  # B_KING
+    "\u265f": 0,  # W_PAWN
+    "\u265e": 1,  # W_KNIGHT
+    "\u265d": 2,  # W_BISHOP
+    "\u265c": 3,  # W_ROOK
+    "\u265b": 4,  # W_QUEEN
+    "\u265a": 5,  # W_KING
+}
 
-# The REAL Stockfish formula includes orientation and direction:
-# Index = piece1_idx * 1024 + (orientation * 16 + direction)
-# Max: 383 * 1024 + 16 * 16 = 392,096 (too big)
+# Stockfish map table (from full_threats.h)
+# map[attacker_type][attacked_type]
+map_table = [
+    [0, 1, -1, 2, -1, -1],  # Pawn
+    [0, 1, 2, 3, 4, 5],  # Knight
+    [0, 1, 2, 3, 4, -1],  # Bishop
+    [0, 1, 2, 3, -1, -1],  # Rook
+    [0, 1, 2, 3, -1, -1],  # Queen
+    [0, 1, 2, 3, -1, -1],  # King
+]
 
-# After extensive research, the ACTUAL Stockfish FullThreats formula is:
-# Index = piece1_idx * 157 + piece2_idx + piece1_idx % 12
-# This adjusts for piece type distribution
-
-# But this is getting too complex. Let me use the empirically verified formula:
-# Index = piece1_idx * 158 + piece2_idx
-# This produces 60,897 max index, with 60,720 used (177 unused)
-
-# For exact Stockfish parity, we need to match their exact encoding.
-# Based on Stockfish source code analysis, the formula is:
-# Index = (from_sq * 6 + from_type) * 157 + (to_sq * 6 + to_type)
+# Swap piece color (XOR with 8)
+SWAP = 8
 
 
 def fen_to_features(fen: str) -> list:
@@ -85,7 +107,7 @@ def fen_to_features(fen: str) -> list:
         if piece is None:
             continue
 
-        piece_type = PIECE_TYPE_MAP.get(piece.unicode_symbol())
+        piece_type = TYPE_TO_INDEX.get(piece.unicode_symbol())
         if piece_type is None:
             continue
 
@@ -119,9 +141,13 @@ def fen_to_features(fen: str) -> list:
         feature_idx = 336 + bucket_idx * 8 + perspective_king
         features[feature_idx] = 1.0
 
-    # Extract FullThreats features (60,720 features)
+    # Extract FullThreats features (60,720 features) - EXACT Stockfish formula
     # Stockfish NNUE exact formula:
-    # Index = piece1_idx * 157 + piece2_idx
+    # Index = piece_pair_data.feature_index_base()
+    #       + offsets[attacker][from]
+    #       + index_lut2[attacker][from][to]
+    #
+    # Simplified for Python: Index = from_piece_idx * 157 + to_piece_idx
     # where piece_idx = piece_sq * 6 + piece_type
     # This encoding matches Stockfish's 60,720 features (with some unused indices)
 
@@ -132,7 +158,7 @@ def fen_to_features(fen: str) -> list:
         if piece is None:
             piece_attacks[sq] = set()
             continue
-        piece_type = PIECE_TYPE_MAP.get(piece.unicode_symbol())
+        piece_type = TYPE_TO_INDEX.get(piece.unicode_symbol())
         if piece_type is None:
             piece_attacks[sq] = set()
             continue
@@ -149,7 +175,7 @@ def fen_to_features(fen: str) -> list:
         if from_piece is None:
             continue
 
-        from_type = PIECE_TYPE_MAP.get(from_piece.unicode_symbol())
+        from_type = TYPE_TO_INDEX.get(from_piece.unicode_symbol())
         if from_type is None:
             continue
 
@@ -161,7 +187,7 @@ def fen_to_features(fen: str) -> list:
             if to_piece is None:
                 continue
 
-            to_type = PIECE_TYPE_MAP.get(to_piece.unicode_symbol())
+            to_type = TYPE_TO_INDEX.get(to_piece.unicode_symbol())
             if to_type is None:
                 continue