diff --git a/src/cache/drug_cache.py b/src/cache/drug_cache.py
index 43fbb0a..d998eaf 100644
--- a/src/cache/drug_cache.py
+++ b/src/cache/drug_cache.py
@@ -1,12 +1,14 @@
-
 import json
+import re
+
 import httpx
 from pydantic import BaseModel
+from sqlalchemy.exc import IntegrityError
+
+from src.config import settings
 from src.database import Drug, Session
 from src.drug_price_parser import DrugPriceParser, DrugPriceResponse
-from src.config import settings
 from src.services.session_service import session_service
-from sqlalchemy.exc import IntegrityError
 
 
 class DrugFull(BaseModel):
@@ -16,6 +18,15 @@ class DrugFull(BaseModel):
     unit_price: float
     description: str | None = None
 
+def make_drug_full(drug: Drug):
+    return DrugFull(
+        name=drug.name,
+        dosage=drug.dosage,
+        dosage_unit=drug.dosage_unit,
+        unit_price=drug.unit_price,
+        description=drug.description,
+    )
+
 
 async def convert_drug_result(drug: DrugPriceResponse) -> list[DrugFull]:
     base_url = settings.TALESTORM_API_BASE_URL
@@ -24,7 +35,7 @@ async def convert_drug_result(drug: DrugPriceResponse) -> list[DrugFull]:
     client = httpx.AsyncClient(
         base_url=base_url,
         headers={"X-API-Key": api_key},
-        timeout=httpx.Timeout(60.0, connect=10.0)  # 30s total timeout, 10s connect timeout
+        timeout=httpx.Timeout(60.0)
     )
     session_id = await session_service.create_session(agent_id=settings.TALESTORM_DRUG_AGENT_ID)
     drug_json = drug.model_dump_json()
@@ -74,34 +85,55 @@ async def store_drug(drugs: list[DrugFull]):
                 pass
 
 
+def parse_dosage_unit(dosage_unit: str):
+    m = re.match(r"^([a-zA-Z]+)\s*/\s*(\d*\.?\d*)\s*([a-zA-Z]+)$", dosage_unit, re.IGNORECASE)
+    if m:
+        x1 = m.group(1)
+        y = float(m.group(2))
+        x2 = m.group(3)
+        return x1, y, x2
+    return None, 1, None
+
+def check_drug_dosage(d: DrugFull, dosage: float) -> DrugFull | None:
+    if d.dosage_unit == "mg" and dosage == d.dosage:
+        return d
+
+    if (d.dosage_unit == "mcg" and dosage * 1000 == d.dosage) or (d.dosage_unit == "g" and dosage / 1000 == d.dosage):
+        return d
+
+    x1, y, x2 = parse_dosage_unit(d.dosage_unit)
+
+    if x1 is not None and ((x1 == "mg" and dosage == d.dosage) or (x1 == "mcg" and dosage * 1000 == d.dosage) or (x1 == "g" and dosage / 1000 == d.dosage)):
+        d.unit_price *= y
+        return d
+    return None
+
+
 async def fetch_drug_with_dosage(drug_name: str, dosage: float) -> DrugFull | None:
     try:
         with Session() as session:
-            drug = session.query(Drug).filter(Drug.name == drug_name, Drug.dosage == dosage).first()
-            if drug:
-                return DrugFull.model_validate(drug)
-            
-            drug = session.query(Drug).filter(Drug.name == drug_name).first()
-            if drug:
-                return DrugFull.model_validate(drug)
-    except:
+            drugs = session.query(Drug).filter(Drug.name == drug_name).all()
+
+            for d in [make_drug_full(df) for df in drugs]:
+                drug_full = check_drug_dosage(d, dosage)
+                if drug_full is not None:
+                    return drug_full
+
+    except Exception as e:
         pass
 
     drugs = await get_drug(drug_name)
-    print(f"Drug {drug_name} found {drugs}")
+
     try:
         await store_drug(drugs)
     except Exception as e:
         print(f"Error storing drug {drug_name}: {e}")
         pass
     
-    drug = None
     for c_drug in drugs:
-        if c_drug.dosage == dosage:
-            drug = c_drug
-
-    if drug:
-        return DrugFull.model_validate(drug)
+        drug_full = check_drug_dosage(c_drug, dosage)
+        if drug_full:
+            return drug_full
 
     raise Exception(f"Drug {drug_name} with dosage {dosage} not found")
 
diff --git a/src/services/estimation_service_v2.py b/src/services/estimation_service_v2.py
index f3801cb..038fdd3 100644
--- a/src/services/estimation_service_v2.py
+++ b/src/services/estimation_service_v2.py
@@ -354,9 +354,10 @@ class EstimationService:
             if medication.applicant != applicant_id:
                 continue
             try:
-                drug_name = medication.name
+                drug_name = medication.name.lower()
                 drug_url = search_drug(drug_name)
                 drug_dosage = float(medication.dosage)
+                print(f"{drug_name} | {drug_url} | {drug_dosage}")
                 drug_price = await fetch_drug_with_dosage(drug_url, drug_dosage)
 
                 if medication.frequency in ["Once daily", "At bedtime"]:
@@ -378,6 +379,7 @@ class EstimationService:
 
                 rx_spend += drug_price.unit_price * month_times
             except Exception as e:
+                raise e
                 print(f"Error calculating rx spend for {medication.name}: {e}")
                 pass
         return rx_spend