diff --git a/src/components/Card/TagRow.astro b/src/components/Card/TagRow.astro
index af56aec..28ec731 100644
--- a/src/components/Card/TagRow.astro
+++ b/src/components/Card/TagRow.astro
@@ -2,21 +2,11 @@
 import client from "../../data/pocketbase"
 
 interface Props {
-    tagIds: string[]
+    tags: string[]
 }
 
-const { tagIds } = Astro.props
+const { tags } = Astro.props
 
-const tags = tagIds && tagIds.length > 0 
-    ? await Promise.all(tagIds.map(async (tagId: string) => {
-        try {
-            const tagData = await client.collection("tags").getOne(tagId)
-            return { name: tagData.name, id: tagId }
-        } catch (error) {
-            return null
-        }
-      }))
-    : []
 ---
 
 <div class="">
diff --git a/src/components/Detail/ImageCarousel.astro b/src/components/Detail/ImageCarousel.astro
index bbdc8c6..3e5f90d 100644
--- a/src/components/Detail/ImageCarousel.astro
+++ b/src/components/Detail/ImageCarousel.astro
@@ -1,17 +1,7 @@
 ---
 import client from "@/data/pocketbase";
 const { class: className, recipe } = Astro.props
-
-async function getLink(img: string) {
-    const record = await client.collection("images").getOne(img)
-    const link = await client.files.getRelativeURL(record, record.image)
-    return link
-}
-
-// Use Promise.all to wait for all async operations to complete
-const links = await Promise.all(
-    recipe.images.map((img: string) => getLink(img))
-)
+const links = await client.getRecipeImages(recipe as string)
 
 ---
 
diff --git a/src/components/Detail/InfoView.astro b/src/components/Detail/InfoView.astro
index 2516136..4bde49e 100644
--- a/src/components/Detail/InfoView.astro
+++ b/src/components/Detail/InfoView.astro
@@ -26,4 +26,4 @@ const waitTime = formatTime(re.waittime)
     {waitTime && (<p class="border-r px-2">{waitTime} Wait</p>)}
     {re.rating !== 0 && (<p class="pl-2">{re.rating}</p><p class="text-white/40 text-xs">/10</p>)}
 </div>
-<TagRow tagIds={re.tags}/>
\ No newline at end of file
+<TagRow tags={re.expand.tags}/>
\ No newline at end of file
diff --git a/src/components/Detail/StepIngredientSideView.astro b/src/components/Detail/StepIngredientSideView.astro
index b4cdc49..325890d 100644
--- a/src/components/Detail/StepIngredientSideView.astro
+++ b/src/components/Detail/StepIngredientSideView.astro
@@ -3,13 +3,10 @@ import client from "@/data/pocketbase";
 
 const { ingredients, class: className } = Astro.props;
 
-const ings = await Promise.all(
-    ingredients.map(async i => await client.collection("ingredients").getOne(i))
-)
 ---
 
 <div class={className}>
-    {ings.map(i => (
+    {ingredients.map(i => (
         <div class="text-sm">
             <p>• {i.quantity} {i.unit || " "}  {i.name}</p>
         </div>
diff --git a/src/components/Detail/StepView.astro b/src/components/Detail/StepView.astro
index 1860721..ef41ea5 100644
--- a/src/components/Detail/StepView.astro
+++ b/src/components/Detail/StepView.astro
@@ -16,7 +16,7 @@ const { steps, class: className } = Astro.props
                 <p class="w-full md:flex-2/3 pr-1 text-left">{s.instruction}</p>
                 {s.ingredients && s.ingredients.length > 0 && (
                     <div class="w-full md:w-auto md:flex-2/5 mt-2 md:mt-0 md:ml-2 md:pl-3 md:border-l text-white/70 border-white/70">
-                        <StepIngredientSideView class="text-left" ingredients={s.ingredients} />
+                        <StepIngredientSideView class="text-left" ingredients={s.expand.ingredients} />
                     </div>
                 )}
             </div>
diff --git a/src/data/pocketbase.ts b/src/data/pocketbase.ts
index 7fe09de..d2b63ab 100644
--- a/src/data/pocketbase.ts
+++ b/src/data/pocketbase.ts
@@ -35,8 +35,26 @@ class APIClient {
     }
 
     async getRecipe(id: string) {
-        return await this.client.collection<Recipe>(Collection.RECIPES).getOne(id, { expand: 'ingredients,tags,steps' })
+        return await this.client.collection<Recipe>(Collection.RECIPES).getOne(id, { expand: 'ingredients,tags,steps,images,steps.ingredients' })
     }
+
+    // IMAGE
+    async getImageURL(imgID: string, relative: boolean = true) {
+        const record = await this.client.collection("images").getOne(imgID)
+        const res = this.client.files.getURL(record, record.image)
+        return relative ? res.substring(21) : res
+    }
+
+    async getRecipeImages(recipeID: string) {
+        const re = await this.getRecipe(recipeID)
+        const imgIDs = re.images ?? []
+
+        const urls = Promise.all(
+            imgIDs.map(img => this.getImageURL(img))
+        )
+        return urls
+    }
+
 }
 const client = new APIClient()
 export default client;
\ No newline at end of file
diff --git a/src/data/schema.ts b/src/data/schema.ts
index efaab1c..e2b49f3 100644
--- a/src/data/schema.ts
+++ b/src/data/schema.ts
@@ -25,6 +25,8 @@ export interface Tag extends BaseRecord {
 // it is here in case it is (a good idea)
 export interface Image extends BaseRecord {
     id: string
+    filename: string
+    url?: string
 }
 
 export interface Recipe extends BaseRecord {
diff --git a/src/pages/recipe/[recipeid].astro b/src/pages/recipe/[recipeid].astro
index ffe0c54..1b938d1 100644
--- a/src/pages/recipe/[recipeid].astro
+++ b/src/pages/recipe/[recipeid].astro
@@ -15,7 +15,7 @@ const re = await client.getRecipe(recipeid as string)
 <SiteLayout>
     <div class="flex flex-col md:flex-row mx-auto justify-center w-full lg:max-w-3/4 xl:max-w-2/3 2xl:max-w-1/2">
         <div class="flex md:flex-1/3 flex-col mt-2 md:mt-4 sticky">
-            <ImageCarousel class="w-full" recipe={re} />
+            <ImageCarousel class="w-full" recipe={recipeid} />
             <p class="text-[28pt] font-bold leading-11 mt-2">{re.name}</p>
 
             <!-- Details -->