diff --git a/app/api/automation/status/route.js b/app/api/automation/status/route.js
index 8c17824..1ce1454 100644
--- a/app/api/automation/status/route.js
+++ b/app/api/automation/status/route.js
@@ -1,21 +1,12 @@
 import { NextResponse } from 'next/server'
-import { PrismaClient } from '@prisma/client'
-
-const prisma = new PrismaClient()
+import { automationService } from '../../../../lib/automation-service-simple'
 
 export async function GET() {
   try {
-    // Get the latest automation session with correct data
-    const session = await prisma.automationSession.findFirst({
-      where: {
-        userId: 'default-user',
-        symbol: 'SOLUSD',
-        timeframe: '1h'
-      },
-      orderBy: { createdAt: 'desc' }
-    })
-
-    if (!session) {
+    // Get status from the automation service directly (includes timing and individual results)
+    const status = await automationService.getStatus()
+    
+    if (!status) {
       return NextResponse.json({
         success: true,
         status: {
@@ -27,51 +18,18 @@ export async function GET() {
           successfulTrades: 0,
           winRate: 0,
           totalPnL: 0,
-          errorCount: 0
+          errorCount: 0,
+          nextAnalysisIn: 0,
+          analysisInterval: 3600,
+          currentCycle: 0,
+          individualTimeframeResults: []
         }
       })
     }
 
-    // Get actual trade data to calculate real statistics
-    const trades = await prisma.trade.findMany({
-      where: {
-        userId: session.userId,
-        symbol: session.symbol
-      },
-      orderBy: { createdAt: 'desc' }
-    })
-
-    const completedTrades = trades.filter(t => t.status === 'COMPLETED')
-    const successfulTrades = completedTrades.filter(t => {
-      const profit = t.profit || 0
-      return profit > 0
-    })
-
-    const totalPnL = completedTrades.reduce((sum, trade) => {
-      const profit = trade.profit || 0
-      return sum + profit
-    }, 0)
-
-    const winRate = completedTrades.length > 0 ? 
-      (successfulTrades.length / completedTrades.length * 100) : 0
-
     return NextResponse.json({
       success: true,
-      status: {
-        isActive: session.status === 'ACTIVE',
-        mode: session.mode,
-        symbol: session.symbol,
-        timeframe: session.timeframe,
-        totalTrades: completedTrades.length,
-        successfulTrades: successfulTrades.length,
-        winRate: Math.round(winRate * 10) / 10, // Round to 1 decimal
-        totalPnL: Math.round(totalPnL * 100) / 100, // Round to 2 decimals
-        lastAnalysis: session.lastAnalysis,
-        lastTrade: session.lastTrade,
-        nextScheduled: session.nextScheduled,
-        errorCount: session.errorCount,
-        lastError: session.lastError
-      }
+      status: status
     })
   } catch (error) {
     console.error('Automation status error:', error)
diff --git a/app/automation-v2/page.js b/app/automation-v2/page.js
index 07090bb..cfb9957 100644
--- a/app/automation-v2/page.js
+++ b/app/automation-v2/page.js
@@ -30,6 +30,7 @@ export default function AutomationPageV2() {
   const [balance, setBalance] = useState(null)
   const [positions, setPositions] = useState([])
   const [loading, setLoading] = useState(false)
+  const [nextAnalysisCountdown, setNextAnalysisCountdown] = useState(0)
 
   useEffect(() => {
     fetchStatus()
@@ -44,6 +45,51 @@ export default function AutomationPageV2() {
     return () => clearInterval(interval)
   }, [])
 
+  // Timer effect for countdown
+  useEffect(() => {
+    let countdownInterval = null
+    
+    if (status?.isActive && status?.nextAnalysisIn > 0) {
+      setNextAnalysisCountdown(status.nextAnalysisIn)
+      
+      countdownInterval = setInterval(() => {
+        setNextAnalysisCountdown(prev => {
+          if (prev <= 1) {
+            // Refresh status when timer reaches 0
+            fetchStatus()
+            return 0
+          }
+          return prev - 1
+        })
+      }, 1000)
+    } else {
+      setNextAnalysisCountdown(0)
+    }
+    
+    return () => {
+      if (countdownInterval) {
+        clearInterval(countdownInterval)
+      }
+    }
+  }, [status?.nextAnalysisIn, status?.isActive])
+
+  // Helper function to format countdown time
+  const formatCountdown = (seconds) => {
+    if (seconds <= 0) return 'Analyzing now...'
+    
+    const hours = Math.floor(seconds / 3600)
+    const minutes = Math.floor((seconds % 3600) / 60)
+    const secs = seconds % 60
+    
+    if (hours > 0) {
+      return `${hours}h ${minutes}m ${secs}s`
+    } else if (minutes > 0) {
+      return `${minutes}m ${secs}s`
+    } else {
+      return `${secs}s`
+    }
+  }
+
   const toggleTimeframe = (timeframe) => {
     setConfig(prev => ({
       ...prev,
@@ -498,6 +544,82 @@ export default function AutomationPageV2() {
             )}
           </div>
 
+          {/* Analysis Timer */}
+          {status?.isActive && (
+            <div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
+              <div className="flex items-center justify-between mb-4">
+                <h3 className="text-xl font-bold text-white">Analysis Timer</h3>
+                <div className="text-xs text-gray-400">
+                  Cycle #{status.currentCycle || 0}
+                </div>
+              </div>
+              <div className="space-y-3">
+                <div className="text-center">
+                  <div className="text-3xl font-bold text-blue-400 mb-2">
+                    {formatCountdown(nextAnalysisCountdown)}
+                  </div>
+                  <div className="text-sm text-gray-400">
+                    {nextAnalysisCountdown > 0 ? 'Next Analysis In' : 'Analysis Running'}
+                  </div>
+                </div>
+                <div className="bg-gray-700 rounded-full h-2">
+                  <div 
+                    className="bg-blue-500 h-2 rounded-full transition-all duration-1000"
+                    style={{
+                      width: status.analysisInterval > 0 ? 
+                        `${Math.max(0, 100 - (nextAnalysisCountdown / status.analysisInterval) * 100)}%` : 
+                        '0%'
+                    }}
+                  ></div>
+                </div>
+                <div className="text-xs text-gray-400 text-center">
+                  Analysis Interval: {Math.floor((status.analysisInterval || 0) / 60)}m
+                </div>
+              </div>
+            </div>
+          )}
+
+          {/* Individual Timeframe Results */}
+          {status?.individualTimeframeResults && status.individualTimeframeResults.length > 0 && (
+            <div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
+              <h3 className="text-xl font-bold text-white mb-4">Timeframe Analysis</h3>
+              <div className="space-y-2">
+                {status.individualTimeframeResults.map((result, index) => (
+                  <div key={index} className="flex items-center justify-between p-3 bg-gray-700/50 rounded-lg">
+                    <div className="flex items-center space-x-3">
+                      <span className="text-cyan-400 font-bold text-sm w-8">
+                        {timeframes.find(tf => tf.value === result.timeframe)?.label || result.timeframe}
+                      </span>
+                      <span className={`font-semibold text-sm px-2 py-1 rounded ${
+                        result.recommendation === 'BUY' ? 'bg-green-600/20 text-green-400' :
+                        result.recommendation === 'SELL' ? 'bg-red-600/20 text-red-400' :
+                        'bg-gray-600/20 text-gray-400'
+                      }`}>
+                        {result.recommendation}
+                      </span>
+                    </div>
+                    <div className="text-right">
+                      <div className="text-white font-semibold text-sm">
+                        {result.confidence}%
+                      </div>
+                      <div className="text-xs text-gray-400">
+                        confidence
+                      </div>
+                    </div>
+                  </div>
+                ))}
+              </div>
+              <div className="mt-4 p-3 bg-blue-600/10 border border-blue-600/30 rounded-lg">
+                <div className="text-xs text-blue-400">
+                  ✅ Last Updated: {status.individualTimeframeResults[0]?.timestamp ? 
+                    new Date(status.individualTimeframeResults[0].timestamp).toLocaleTimeString() : 
+                    'N/A'
+                  }
+                </div>
+              </div>
+            </div>
+          )}
+
           {/* Trading Metrics */}
           <div className="bg-gray-800 p-6 rounded-lg border border-gray-700">
             <h3 className="text-xl font-bold text-white mb-4">Trading Metrics</h3>
diff --git a/prisma/prisma/dev.db b/prisma/prisma/dev.db
index b9fd53c..3dd4b32 100644
Binary files a/prisma/prisma/dev.db and b/prisma/prisma/dev.db differ