diff --git a/app/api/trading/execute/route.ts b/app/api/trading/execute/route.ts
index 2aa4dd5..409932d 100644
--- a/app/api/trading/execute/route.ts
+++ b/app/api/trading/execute/route.ts
@@ -8,7 +8,7 @@
 import { NextRequest, NextResponse } from 'next/server'
 import { initializeDriftService } from '@/lib/drift/client'
 import { openPosition, placeExitOrders, closePosition } from '@/lib/drift/orders'
-import { normalizeTradingViewSymbol, getMinQualityScoreForDirection } from '@/config/trading'
+import { normalizeTradingViewSymbol, getMinQualityScoreForDirection, getMarketConfig } from '@/config/trading'
 import { getMergedConfig } from '@/config/trading'
 import { getInitializedPositionManager, ActiveTrade } from '@/lib/trading/position-manager'
 import { createTrade, updateTradeExit } from '@/lib/database/trades'
@@ -143,9 +143,10 @@ export async function POST(request: NextRequest): Promise<NextResponse<ExecuteTr
       console.log(`📊 DATA COLLECTION: ${timeframe}min signal from ${driftSymbol}, saving for analysis (not executing)`)
       
       // Get current price for entry tracking
-      const priceMonitor = getPythPriceMonitor()
-      const latestPrice = priceMonitor.getCachedPrice(driftSymbol)
-      const currentPrice = latestPrice?.price || body.signalPrice || 0
+      // CRITICAL FIX: Query Drift oracle directly instead of Pyth cache (cache might be stale for 1min signals)
+      const driftService = await initializeDriftService()
+      const marketConfig = getMarketConfig(driftSymbol)
+      const currentPrice = await driftService.getOraclePrice(marketConfig.driftMarketIndex)
       
       // Save to BlockedSignal for cross-timeframe analysis
       const { createBlockedSignal } = await import('@/lib/database/trades')
diff --git a/workflows/trading/parse_signal_enhanced.json b/workflows/trading/parse_signal_enhanced.json
index 1118887..3bcfd3d 100644
--- a/workflows/trading/parse_signal_enhanced.json
+++ b/workflows/trading/parse_signal_enhanced.json
@@ -3,7 +3,7 @@
   "nodes": [
     {
       "parameters": {
-        "jsCode": "// Get the body - it might be a string or nested in an object\nlet body = $json.body || $json.query?.body || JSON.stringify($json);\n\n// If body is an object, stringify it\nif (typeof body === 'object') {\n  body = JSON.stringify(body);\n}\n\n// Parse basic signal (existing logic)\nconst symbolMatch = body.match(/\\b(SOL|BTC|ETH)\\b/i);\nconst symbol = symbolMatch ? symbolMatch[1].toUpperCase() + '-PERP' : 'SOL-PERP';\n\nconst direction = body.match(/\\b(sell|short)\\b/i) ? 'short' : 'long';\n\n// Enhanced timeframe extraction supporting multiple formats:\n// - \"buy 5\" → \"5\"\n// - \"buy 15\" → \"15\"\n// - \"buy 60\" or \"buy 1h\" → \"60\"\n// - \"buy 240\" or \"buy 4h\" → \"240\"\n// - \"buy D\" or \"buy 1d\" → \"D\"\n// - \"buy W\" → \"W\"\nconst timeframeMatch = body.match(/\\b(buy|sell)\\s+(\\d+|D|W|M|1h|4h|1d)\\b/i);\nlet timeframe = '5'; // Default to 5min\n\nif (timeframeMatch) {\n  const tf = timeframeMatch[2];\n  // Convert hour/day notation to minutes\n  if (tf === '1h' || tf === '60') {\n    timeframe = '60';\n  } else if (tf === '4h' || tf === '240') {\n    timeframe = '240';\n  } else if (tf === '1d' || tf.toUpperCase() === 'D') {\n    timeframe = 'D';\n  } else if (tf.toUpperCase() === 'W') {\n    timeframe = 'W';\n  } else if (tf.toUpperCase() === 'M') {\n    timeframe = 'M';\n  } else {\n    timeframe = tf;\n  }\n}\n\n// Parse new context metrics from enhanced format:\n// \"SOLT.P buy 15 | ATR:0.65 | ADX:14.3 | RSI:51.3 | VOL:0.87 | POS:59.3 | MAGAP:-1.23 | IND:v9\"\nconst atrMatch = body.match(/ATR:([\\d.]+)/);\nconst atr = atrMatch ? parseFloat(atrMatch[1]) : 0;\n\nconst adxMatch = body.match(/ADX:([\\d.]+)/);\nconst adx = adxMatch ? parseFloat(adxMatch[1]) : 0;\n\nconst rsiMatch = body.match(/RSI:([\\d.]+)/);\nconst rsi = rsiMatch ? parseFloat(rsiMatch[1]) : 0;\n\nconst volumeMatch = body.match(/VOL:([\\d.]+)/);\nconst volumeRatio = volumeMatch ? parseFloat(volumeMatch[1]) : 0;\n\nconst pricePositionMatch = body.match(/POS:([\\d.]+)/);\nconst pricePosition = pricePositionMatch ? parseFloat(pricePositionMatch[1]) : 0;\n\n// Parse signal price from \"@ price\" format (for 1min data feed and v9 signals)\n// Must match: \"buy 1 @ 142.08 |\" (@ followed by price before first pipe)\nconst signalPriceMatch = body.match(/@\\s*([\\d.]+)\\s*\\|/);\nconst signalPrice = signalPriceMatch ? parseFloat(signalPriceMatch[1]) : undefined;\n\n// V9: Parse MA gap (optional, backward compatible with v8)\nconst maGapMatch = body.match(/MAGAP:([-\\d.]+)/);\nconst maGap = maGapMatch ? parseFloat(maGapMatch[1]) : undefined;\n\n// Parse indicator version (optional, backward compatible)\nconst indicatorVersionMatch = body.match(/IND:(v\\d+)/i);\nconst indicatorVersion = indicatorVersionMatch ? indicatorVersionMatch[1] : 'v5';\n\nreturn {\n  rawMessage: body,\n  symbol,\n  direction,\n  timeframe,\n  signalPrice, // NEW: Actual price from TradingView\n  // Context fields\n  atr,\n  adx,\n  rsi,\n  volumeRatio,\n  pricePosition,\n  maGap, // V9 NEW\n  // Version tracking (defaults to v5 for backward compatibility)\n  indicatorVersion\n};"
+        "jsCode": "// Get the body - it might be a string or nested in an object\nlet body = $json.body || $json.query?.body || JSON.stringify($json);\n\n// If body is an object, stringify it\nif (typeof body === 'object') {\n  body = JSON.stringify(body);\n}\n\n// Parse basic signal (existing logic)\nconst symbolMatch = body.match(/\\b(SOL|BTC|ETH)\\b/i);\nconst symbol = symbolMatch ? symbolMatch[1].toUpperCase() + '-PERP' : 'SOL-PERP';\n\nconst direction = body.match(/\\b(sell|short)\\b/i) ? 'short' : 'long';\n\n// Enhanced timeframe extraction supporting multiple formats:\n// - \"buy 5\" → \"5\"\n// - \"buy 15\" → \"15\"\n// - \"buy 60\" or \"buy 1h\" → \"60\"\n// - \"buy 240\" or \"buy 4h\" → \"240\"\n// - \"buy D\" or \"buy 1d\" → \"D\"\n// - \"buy W\" → \"W\"\nconst timeframeMatch = body.match(/\\b(buy|sell)\\s+(\\d+|D|W|M|1h|4h|1d)\\b/i);\nlet timeframe = '5'; // Default to 5min\n\nif (timeframeMatch) {\n  const tf = timeframeMatch[2];\n  // Convert hour/day notation to minutes\n  if (tf === '1h' || tf === '60') {\n    timeframe = '60';\n  } else if (tf === '4h' || tf === '240') {\n    timeframe = '240';\n  } else if (tf === '1d' || tf.toUpperCase() === 'D') {\n    timeframe = 'D';\n  } else if (tf.toUpperCase() === 'W') {\n    timeframe = 'W';\n  } else if (tf.toUpperCase() === 'M') {\n    timeframe = 'M';\n  } else {\n    timeframe = tf;\n  }\n}\n\n// Parse new context metrics from enhanced format:\n// \"SOLT.P buy 15 | ATR:0.65 | ADX:14.3 | RSI:51.3 | VOL:0.87 | POS:59.3 | MAGAP:-1.23 | IND:v9\"\nconst atrMatch = body.match(/ATR:([\\d.]+)/);\nconst atr = atrMatch ? parseFloat(atrMatch[1]) : 0;\n\nconst adxMatch = body.match(/ADX:([\\d.]+)/);\nconst adx = adxMatch ? parseFloat(adxMatch[1]) : 0;\n\nconst rsiMatch = body.match(/RSI:([\\d.]+)/);\nconst rsi = rsiMatch ? parseFloat(rsiMatch[1]) : 0;\n\nconst volumeMatch = body.match(/VOL:([\\d.]+)/);\nconst volumeRatio = volumeMatch ? parseFloat(volumeMatch[1]) : 0;\n\nconst pricePositionMatch = body.match(/POS:([\\d.]+)/);\nconst pricePosition = pricePositionMatch ? parseFloat(pricePositionMatch[1]) : 0;\n\n// Parse signal price from \"@ price\" format (for 1min data feed and v9 signals)\n// Must match: \"buy 1 @ 142.08 |\" (@ followed by price before first pipe)\n// DEBUG: Log body to see actual format\nconsole.log('DEBUG body:', body);\nconst signalPriceMatch = body.match(/@\\s*([\\d.]+)\\s*\\|/);\nconsole.log('DEBUG signalPriceMatch:', signalPriceMatch);\nconst signalPrice = signalPriceMatch ? parseFloat(signalPriceMatch[1]) : undefined;\nconsole.log('DEBUG signalPrice:', signalPrice, 'pricePosition will be:', body.match(/POS:([\\d.]+)/) ? body.match(/POS:([\\d.]+)/)[1] : 'not found');\n\n// V9: Parse MA gap (optional, backward compatible with v8)\nconst maGapMatch = body.match(/MAGAP:([-\\d.]+)/);\nconst maGap = maGapMatch ? parseFloat(maGapMatch[1]) : undefined;\n\n// Parse indicator version (optional, backward compatible)\nconst indicatorVersionMatch = body.match(/IND:(v\\d+)/i);\nconst indicatorVersion = indicatorVersionMatch ? indicatorVersionMatch[1] : 'v5';\n\nreturn {\n  rawMessage: body,\n  symbol,\n  direction,\n  timeframe,\n  signalPrice, // NEW: Actual price from TradingView\n  // Context fields\n  atr,\n  adx,\n  rsi,\n  volumeRatio,\n  pricePosition,\n  maGap, // V9 NEW\n  // Version tracking (defaults to v5 for backward compatibility)\n  indicatorVersion\n};"
       },
       "id": "parse-signal-enhanced",
       "name": "Parse Signal Enhanced",