Index: backend/src/main/java/com/tradingmk/backend/model/Stock.java
===================================================================
--- backend/src/main/java/com/tradingmk/backend/model/Stock.java	(revision 344dcefa72d70d58aa501d6657b04068ef4601b6)
+++ backend/src/main/java/com/tradingmk/backend/model/Stock.java	(revision c31945bcfe46c1dbaa59c64592ea3ff31d4b5898)
@@ -2,4 +2,5 @@
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 
@@ -17,6 +18,19 @@
     private String symbol;
     private String name;
+
+    @JsonProperty("currentPrice")
     private Double currentPrice;
+
     private LocalDateTime lastUpdated;
+    private Double lastPrice;
+    public Double getLastPrice() {
+        return lastPrice;
+    }
+
+    public void setLastPrice(Double lastPrice) {
+        this.lastPrice = lastPrice;
+    }
+
+
 
     @Column(nullable = false)
Index: backend/src/main/java/com/tradingmk/backend/service/StockService.java
===================================================================
--- backend/src/main/java/com/tradingmk/backend/service/StockService.java	(revision 344dcefa72d70d58aa501d6657b04068ef4601b6)
+++ backend/src/main/java/com/tradingmk/backend/service/StockService.java	(revision c31945bcfe46c1dbaa59c64592ea3ff31d4b5898)
@@ -29,5 +29,5 @@
             if (existing.isPresent()) {
                 Stock stock = existing.get();
-                stock.setCurrentPrice(incoming.getCurrentPrice());
+                stock.setLastPrice(incoming.getLastPrice());
                 stock.setName(incoming.getName());
                 stock.setLastUpdated(LocalDateTime.now());
@@ -37,7 +37,12 @@
                 stock.setPercentage(incoming.getPercentage());
                 stock.setTurnover(incoming.getTurnover());
+                stock.setCurrentPrice(incoming.getCurrentPrice());
+                System.out.println("Received stock: " + stock.getSymbol() + " with currentPrice: " + stock.getCurrentPrice());
+                System.out.println("Before save: " + stock.getCurrentPrice());
                 stockRepository.save(stock);
+                System.out.println("afterr save: " + stock.getCurrentPrice());
             } else {
                 incoming.setLastUpdated(LocalDateTime.now());
+
                 stockRepository.save(incoming);
             }
Index: frontend/src/pages/Dashboard/BreakdownSection/BreakdownSection.jsx
===================================================================
--- frontend/src/pages/Dashboard/BreakdownSection/BreakdownSection.jsx	(revision 344dcefa72d70d58aa501d6657b04068ef4601b6)
+++ frontend/src/pages/Dashboard/BreakdownSection/BreakdownSection.jsx	(revision c31945bcfe46c1dbaa59c64592ea3ff31d4b5898)
@@ -51,5 +51,5 @@
                     </span>
                                 </td>
-                                <td className="py-4 text-right font-medium text-gray-900">{token.currentPrice}</td>
+                                <td className="py-4 text-right font-medium text-gray-900">{token.lastPrice}</td>
                                 <td className="py-4">
                                     <ChevronRight className="w-4 h-4 text-gray-400" />
Index: frontend/src/pages/DetailedStockView/DetailedStockView.jsx
===================================================================
--- frontend/src/pages/DetailedStockView/DetailedStockView.jsx	(revision 344dcefa72d70d58aa501d6657b04068ef4601b6)
+++ frontend/src/pages/DetailedStockView/DetailedStockView.jsx	(revision c31945bcfe46c1dbaa59c64592ea3ff31d4b5898)
@@ -129,5 +129,5 @@
                     </div>
 
-                    {/* Buy BTC Button */}
+
                     <button className="w-full bg-gradient-to-r from-green-400 to-blue-500 text-white py-3 rounded-lg font-medium mb-4">
                         Buy
@@ -135,5 +135,5 @@
 
 
-                    {/* Available Balance Card */}
+
                     <div className="bg-gray-50 rounded-lg p-4">
                         <div className="text-sm text-gray-500 mb-2">Available Balance</div>
Index: scraper/scraper.py
===================================================================
--- scraper/scraper.py	(revision 344dcefa72d70d58aa501d6657b04068ef4601b6)
+++ scraper/scraper.py	(revision c31945bcfe46c1dbaa59c64592ea3ff31d4b5898)
@@ -1,7 +1,9 @@
+from ctypes.wintypes import DOUBLE
+
 import requests
 from bs4 import BeautifulSoup
 import time
 BASE_URL = "https://www.mse.mk"
-
+import json
 
 def run_scraper_loop(interval=30):
@@ -9,4 +11,5 @@
         print("Updating stock data...")
         stocks = get_stocks()
+        print(stocks)
         post_to_backend(stocks)
         print("Update done. Waiting...")
@@ -31,6 +34,19 @@
     soup = BeautifulSoup(response.text, "html.parser")
 
+
+    current_prices = {}
+    for li in soup.select(".newsticker a"):
+        parts = li.text.strip().split(" ")
+        if len(parts) >= 2:
+            ticker = parts[0]
+            price_str = parts[1].replace(",", "")
+            try:
+                current_price = float(price_str)
+                current_prices[ticker] = current_price
+            except ValueError:
+                continue
+
+
     stocks = []
-
     for row in soup.select(".tab-content-market-summary table tr")[1:]:
         cols = row.find_all("td")
@@ -45,21 +61,21 @@
 
             name = get_stock_name(detail_url)
-            current_price = float(cols[1].text.strip().replace(",", ""))
+            last_price = float(cols[1].text.strip().replace(",", ""))
             percentage = float(cols[2].text.strip())
             turnover = float(cols[3].text.strip().replace(",", ""))
-            print(percentage)
-            if name != "Unknown":
-                stock = {
-                    "symbol": symbol,
-                    "name": name if name != "Unknown" else symbol,
-                    "currentPrice": current_price,
-                    "percentage": percentage if percentage != 0.0 else 0.0,
-                    "turnover":turnover
-                }
-                stocks.append(stock)
 
+            current_price = current_prices.get(symbol, None)
+
+            stock = {
+                "symbol": symbol,
+                "name": name if name != "Unknown" else symbol,
+                "lastPrice": last_price,
+                "percentage": percentage,
+                "turnover": turnover,
+                "currentPrice": current_price
+            }
+            stocks.append(stock)
 
     return stocks
-
 
 def post_to_backend(stocks):