diff --git a/data/as.json.br b/data/as.json.br
index 1254192..872a20f 100644
Binary files a/data/as.json.br and b/data/as.json.br differ
diff --git a/data/avatar.json.br b/data/avatar.json.br
index 404cef4..f18e58d 100644
Binary files a/data/avatar.json.br and b/data/avatar.json.br differ
diff --git a/data/lightcone.json.br b/data/lightcone.json.br
index 39bf31b..bf61bd6 100644
Binary files a/data/lightcone.json.br and b/data/lightcone.json.br differ
diff --git a/data/metadata.json.br b/data/metadata.json.br
index a182dfb..57e13af 100644
Binary files a/data/metadata.json.br and b/data/metadata.json.br differ
diff --git a/data/moc.json.br b/data/moc.json.br
index 92689c0..f452f2e 100644
Binary files a/data/moc.json.br and b/data/moc.json.br differ
diff --git a/data/monster.json.br b/data/monster.json.br
index 25d28df..c5fc93d 100644
Binary files a/data/monster.json.br and b/data/monster.json.br differ
diff --git a/data/peak.json.br b/data/peak.json.br
index a31f52f..3b7e670 100644
Binary files a/data/peak.json.br and b/data/peak.json.br differ
diff --git a/data/pf.json.br b/data/pf.json.br
index 0c6fb77..e35e3bf 100644
Binary files a/data/pf.json.br and b/data/pf.json.br differ
diff --git a/data/relic.json.br b/data/relic.json.br
index deb2d12..180a7d6 100644
Binary files a/data/relic.json.br and b/data/relic.json.br differ
diff --git a/src/components/eidolonsInfo/index.tsx b/src/components/eidolonsInfo/index.tsx
index 512bd8d..08f383b 100644
--- a/src/components/eidolonsInfo/index.tsx
+++ b/src/components/eidolonsInfo/index.tsx
@@ -42,17 +42,17 @@ export default function EidolonsInfo() {
                                 <div
                                     className="cursor-pointer"
                                     onClick={() => {
-                                        let newRank = Number(key)
-                                        if (avatars[avatarSelected?.ID || ""]?.data?.rank == Number(key)) {
-                                            newRank = Number(key) - 1
+                                        let newRank = Number(rank.Rank)
+                                        if (avatars[avatarSelected?.ID || ""]?.data?.rank == Number(rank.Rank)) {
+                                            newRank = Number(rank.Rank) - 1
                                         }
                                         setAvatars({ ...avatars, [avatarSelected?.ID || ""]: { ...avatars[avatarSelected?.ID || ""], data: { ...avatars[avatarSelected?.ID || ""].data, rank: newRank } } })
                                     }}
                                 >
                                     <Image
-                                        className={`w-60 object-contain mb-2 ${Number(key) <= avatars[avatarSelected?.ID.toString() || ""]?.data?.rank ? "" : "grayscale"}`}
-                                        src={`${process.env.CDN_URL}/ui/ui3d/rank/_dependencies/textures/${avatarSelected?.ID}/${avatarSelected?.ID}_Rank_${key}.png`}
-                                        alt={`Rank ${key}`}
+                                        className={`w-60 object-contain mb-2 ${Number(rank.Rank) <= avatars[avatarSelected?.ID.toString() || ""]?.data?.rank ? "" : "grayscale"}`}
+                                        src={`${process.env.CDN_URL}/ui/ui3d/rank/_dependencies/textures/${avatarSelected?.ID}/${avatarSelected?.ID}_Rank_${rank.Rank}.png`}
+                                        alt={`Rank ${rank.Rank} Image`}
                                         priority
                                         unoptimized
                                         crossOrigin="anonymous"
@@ -61,7 +61,7 @@ export default function EidolonsInfo() {
                                     />
 
                                     <div className="text-lg pb-1 flex items-center justify-items-center gap-2">
-                                        <span className="inline-block text-indigo-500">{key}.</span>
+                                        <span className="inline-block text-indigo-500">{rank.Rank}.</span>
                                         <ParseText
                                             locale={locale}
                                             text={getLocaleName(locale, rank.Name)}
diff --git a/src/components/monsterBar/peak.tsx b/src/components/monsterBar/peak.tsx
index 765cb6e..090d620 100644
--- a/src/components/monsterBar/peak.tsx
+++ b/src/components/monsterBar/peak.tsx
@@ -40,39 +40,42 @@ export default function PeakBar() {
             && bossConfig
             && peak_config?.boss_mode === "Hard"
         ) {
-            return bossConfig
+            return { challenge: bossConfig, isBoss: true }
+        }
+        return {
+            challenge: challenge,
+            isBoss: challenge?.ID === mapPeak?.[peak_config?.event_id?.toString()]?.BossLevel?.ID, 
         }
-        return challenge
     }, [peak_config, listFloor, mapPeak, bossConfig])
 
     useEffect(() => {
-        if (!challengeSelected) return
+        if (!challengeSelected.challenge) return
         if (peak_config.event_id !== 0 && peak_config.challenge_id !== 0 && challengeSelected) {
             const newBattleConfig = structuredClone(peak_config)
             newBattleConfig.cycle_count = 6
             newBattleConfig.blessings = []
-            for (const value of challengeSelected.MazeBuff) {
+            for (const value of challengeSelected?.challenge?.MazeBuff) {
                 newBattleConfig.blessings.push({
                     id: value.ID,
                     level: 1
                 })
             }
-            if (peak_config.buff_id !== 0) {
+            if (peak_config.buff_id !== 0 && challengeSelected.isBoss) {
                 newBattleConfig.blessings.push({
                     id: peak_config.buff_id,
                     level: 1
                 })
             }
             newBattleConfig.monsters = []
-            newBattleConfig.stage_id = challengeSelected.EventList[0].ID
-            for (const wave of challengeSelected.EventList[0].MonsterList) {
+            newBattleConfig.stage_id = challengeSelected.challenge.EventList[0].ID
+            for (const wave of challengeSelected.challenge.EventList[0].MonsterList) {
                 if (!wave) continue
                 const newWave: MonsterStore[] = []
                 for (const value of Object.values(wave)) {
                     if (!value) continue
                     newWave.push({
                         monster_id: value,
-                        level: challengeSelected.EventList[0].Level,
+                        level: challengeSelected.challenge.EventList[0].Level,
                         amount: 1,
                     })
                 }
@@ -180,8 +183,8 @@ export default function PeakBar() {
                         {transI18n("turbulenceBuff")}
                     </h2>
 
-                    {challengeSelected && challengeSelected?.MazeBuff?.length > 0 ? (
-                        challengeSelected.MazeBuff.map((subOption, index) => (
+                    {challengeSelected?.challenge && challengeSelected?.challenge?.MazeBuff?.length > 0 ? (
+                        challengeSelected.challenge.MazeBuff.map((subOption, index) => (
                             <div key={index}>
                                 <label className="label">
                                     <span className="label-text font-bold text-success">
@@ -211,10 +214,10 @@ export default function PeakBar() {
                 <div className="grid grid-cols-1 gap-4">
 
                     <div className="rounded-xl p-4 mt-2 border border-warning">
-                        <h2 className="text-2xl font-bold mb-2 text-info">{getLocaleName(locale, challengeSelected?.Name)}</h2>
+                        <h2 className="text-2xl font-bold mb-2 text-info">{getLocaleName(locale, challengeSelected?.challenge?.Name)}</h2>
                         
 
-                        {challengeSelected && Object.values(challengeSelected?.EventList?.[0]?.Infinite || []).map((waveValue, waveIndex) => (
+                        {challengeSelected?.challenge && Object.values(challengeSelected?.challenge?.EventList?.[0]?.Infinite || []).map((waveValue, waveIndex) => (
                             <div key={waveIndex} className="mb-6">
                                 <h3 className="text-lg font-semibold">{transI18n("wave")} {waveIndex + 1}</h3>
                                 <div className="flex flex-wrap gap-2 mt-2">
@@ -222,8 +225,8 @@ export default function PeakBar() {
                                         const monsterStats = calcMonsterStats(
                                             mapMonster?.[monsterId.toString()],
                                             waveValue.EliteGroup,
-                                            challengeSelected?.EventList?.[0]?.HardLevelGroup,
-                                            challengeSelected?.EventList?.[0]?.Level,
+                                            challengeSelected?.challenge?.EventList?.[0]?.HardLevelGroup || 0,
+                                            challengeSelected?.challenge?.EventList?.[0]?.Level || 0,
                                             hardLevelConfig,
                                             eliteConfig
                                         );
@@ -233,7 +236,7 @@ export default function PeakBar() {
                                                 className="group relative flex flex-col w-40 bg-base-100 rounded-2xl border border-base-300 shadow-md"
                                             >
                                                 <div className="badge badge-warning badge-sm font-bold absolute top-2 right-2 z-10 shadow-sm">
-                                                    Lv. {challengeSelected?.EventList[0].Level}
+                                                    Lv. {challengeSelected?.challenge?.EventList?.[0]?.Level}
                                                 </div>
 
                                                 <div className="relative w-full h-20 bg-base-200 flex items-center justify-center p-4 rounded-t-2xl">