diff --git a/src/App.tsx b/src/App.tsx
index c143dc0..71d6dc3 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -50,7 +50,7 @@ export default function App() {
             </p>
           </div>
 
-          <NepaliDatePicker onDateSelect={setSelectedDate} lang='en' />
+          <NepaliDatePicker onDateSelect={setSelectedDate} />
         </div>
       </main>
     </>
diff --git a/src/components/NepaliCalendar/NepaliCalendar.tsx b/src/components/NepaliCalendar/NepaliCalendar.tsx
index b001b08..85a1a2e 100644
--- a/src/components/NepaliCalendar/NepaliCalendar.tsx
+++ b/src/components/NepaliCalendar/NepaliCalendar.tsx
@@ -48,7 +48,9 @@ export const NepaliCalendar = ({
       return;
     }
 
-    const foundMonth = months.find((m) => m.value === selectedDate.month.value);
+    const foundMonth = months.find(
+      (m) => m.value === selectedDate.month.value - 1
+    );
     if (!foundMonth) {
       console.warn('Month not found');
       return;
diff --git a/src/utils/nepaliDate.ts b/src/utils/nepaliDate.ts
index d50e5e1..eeeb034 100644
--- a/src/utils/nepaliDate.ts
+++ b/src/utils/nepaliDate.ts
@@ -1,5 +1,4 @@
 import { yearsWithDaysInMonth } from '@/constants/yearsWithDaysInMonth';
-import { years } from './year';
 import { months } from '@/constants/months';
 import { weekDays } from '@/constants/weekDays';
 import { Language } from '@/types/Language';
@@ -13,6 +12,7 @@ import { Day, Month, NepaliDate, Year } from '@/types/NepaliDate';
 
 const GREGORIAN_START_YEAR = 1943; // Start year of the Gregorian calendar
 const NEPALI_START_YEAR = 2000; // Start year of the Nepali calendar
+const NEPALI_END_YEAR = 2089; // End year of the Nepali calendar
 const NEPALI_YEAR_OFFSET = NEPALI_START_YEAR - GREGORIAN_START_YEAR; // Convert Gregorian year to Nepali year
 const NEPALI_MONTH_OFFSET = 8; // Add an offset of 8 to convert Gregorian month to Nepali month
 const NEPALI_DATE_OFFSET = 15; // Add an offset of 15 to convert Gregorian date to Nepali date
@@ -78,22 +78,53 @@ export const currentNepaliDate = () => {
   };
 };
 
+const years = generateYears(NEPALI_START_YEAR, NEPALI_END_YEAR);
 export const getYears = (lang: Language): Year[] => {
   return years.map((year) => {
     if (lang === 'ne') {
       return {
         value: year.value,
-        label: year.ne,
+        label: year.label.ne,
       };
     }
 
     return {
       value: year.value,
-      label: year.en,
+      label: year.label.en,
     };
   });
 };
 
+function generateYears(startYear: number, endYear: number) {
+  const years: {
+    label: {
+      ne: string;
+      en: string;
+    };
+    value: number;
+    daysInMonth: [number, number, number][];
+  }[] = [];
+
+  const days = yearsWithDaysInMonth as unknown as {
+    [year: number]: {
+      daysInMonth: [number, number, number][];
+    };
+  };
+
+  for (let year = startYear; year <= endYear; year++) {
+    years.push({
+      label: {
+        ne: convertToNepaliDigit(year),
+        en: year.toString(),
+      },
+      value: year,
+      daysInMonth: days[year].daysInMonth,
+    });
+  }
+
+  return years;
+}
+
 export const getMonths = (lang: Language): Month[] => {
   return months.map((month) => {
     if (lang === 'ne') {
diff --git a/src/utils/year.ts b/src/utils/year.ts
deleted file mode 100644
index d737c40..0000000
--- a/src/utils/year.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { convertToNepaliDigit } from './digit';
-
-import { yearsWithDaysInMonth } from '@/constants/yearsWithDaysInMonth';
-
-export const startYear = 2000;
-
-export const endYear = 2089;
-
-export const years = generateYears(startYear, endYear);
-
-export const getYear = (year: number) => years.find((y) => y.value === year);
-
-function generateYears(startYear: number, endYear: number) {
-  const years: {
-    ne: string;
-    en: string;
-    value: number;
-    daysInMonth: [number, number, number][];
-  }[] = [];
-
-  const days = yearsWithDaysInMonth as unknown as {
-    [year: number]: {
-      daysInMonth: [number, number, number][];
-    };
-  };
-
-  for (let year = startYear; year <= endYear; year++) {
-    years.push({
-      ne: convertToNepaliDigit(year),
-      en: year.toString(),
-      value: year,
-      daysInMonth: days[year].daysInMonth,
-    });
-  }
-
-  return years;
-}