diff --git a/build/api/getCarClasses.js b/build/api/getCarClasses.js
new file mode 100644
index 0000000..678da6f
--- /dev/null
+++ b/build/api/getCarClasses.js
@@ -0,0 +1,12 @@
+import { clientGet } from './iracingClient';
+
+// Only used to help get Ring Meister / Draftmaster in check
+export default async function getCarClasses() {
+  const carClassResponse = await clientGet('/data/carclass/get');
+  return carClassResponse.data.map((carClass) => ({
+    id: carClass.id,
+    cars_in_class: carClass.cars_in_class,
+    name: carClass.car_name,
+    short_name: carClass.short_name,
+  }));
+}
diff --git a/build/scrape.js b/build/scrape.js
index f899cbd..e2bdecb 100644
--- a/build/scrape.js
+++ b/build/scrape.js
@@ -5,6 +5,7 @@ import getContributors from './api/getContributors';
 import getCars from './api/getCars';
 import getTracks from './api/getTracks';
 import getSeason from './api/getSeason';
+import getCarClasses from './api/getCarClasses';
 
 (async () => {
   const username = process.env.IWP_USERNAME || 'test';
@@ -33,4 +34,10 @@ import getSeason from './api/getSeason';
     path.join(__dirname, '../src/data/contributors.json'),
     JSON.stringify(contributors, null, 2),
   );
+
+  const carClasses = await getCarClasses();
+  await writeFile(
+    path.join(__dirname, '../src/data/car-class.json'),
+    JSON.stringify(carClasses, null, 2),
+  );
 })();
diff --git a/src/components/columns/Car.js b/src/components/columns/Car.js
index 7218106..9b52c15 100644
--- a/src/components/columns/Car.js
+++ b/src/components/columns/Car.js
@@ -3,6 +3,7 @@
 import * as React from 'react';
 import classnames from 'classnames';
 import intersection from 'lodash.intersection';
+import { useTranslation } from 'react-i18next';
 import StarIcon from '../icon/StarIcon';
 import CarModal from '../modal/CarModal';
 
@@ -21,33 +22,38 @@ type Props = {
 
 export default function Car({ race, favouriteCars, ownedCars }: Props) {
   const [modalOpen, setModalOpen] = React.useState(false);
+  const { t } = useTranslation();
 
   const openModal = () => {
     setModalOpen(true);
   };
 
+  const knownCar = race.carIds[0] !== null;
+
   return (
     <>
       <ClickableCell
         className={classnames({
-          [styles.success]: intersection(ownedCars, race.carIds).length !== 0,
+          [styles.success]: knownCar ? intersection(ownedCars, race.carIds).length !== 0 : false,
         })}
         onClick={openModal}
       >
-        {intersection(favouriteCars, race.carIds).length !== 0 ? (
+        {knownCar && intersection(favouriteCars, race.carIds).length !== 0 ? (
           <StarIcon />
         ) : null}
         <span> </span>
-        {race.carClasses.join(', ')}
+        {knownCar ? race.carClasses.join(', ') : t('Unknown')}
       </ClickableCell>
-      <CarModal
-        isOpen={modalOpen}
-        onClose={() => setModalOpen(false)}
-        ownedCars={ownedCars}
-        favouriteCars={favouriteCars}
-        carIds={race.carIds}
-        seriesName={race.series}
-      />
+      {knownCar ? (
+        <CarModal
+          isOpen={modalOpen}
+          onClose={() => setModalOpen(false)}
+          ownedCars={ownedCars}
+          favouriteCars={favouriteCars}
+          carIds={race.carIds}
+          seriesName={race.series}
+        />
+      ) : null}
     </>
   );
 }
diff --git a/src/components/modal/SeriesModal.js b/src/components/modal/SeriesModal.js
index ccb1422..201f0de 100644
--- a/src/components/modal/SeriesModal.js
+++ b/src/components/modal/SeriesModal.js
@@ -69,6 +69,8 @@ export default function SeriesModal({ onClose, ownedTracks, ownedCars, isOpen, s
                   .subtract(1, 'days')
                   .toDate();
 
+                const knownCar = race.carIds[0] !== null;
+
                 return (
                   <tr key={race.week} style={current ? { fontWeight: 700 } : {}}>
                     <td>
@@ -80,10 +82,10 @@ export default function SeriesModal({ onClose, ownedTracks, ownedCars, isOpen, s
                     {showCar ? (
                       <td
                         className={classnames({
-                          [styles.success]: intersection(ownedCars, race.carIds).length !== 0,
+                          [styles.success]: knownCar ? intersection(ownedCars, race.carIds).length !== 0 : null,
                         })}
                       >
-                        {race.carClasses.join(', ')}
+                        {knownCar ? race.carClasses.join(', ') : t('Unknown')}
                       </td>
                     ) : null}
                     <td>
diff --git a/src/config.js b/src/config.js
index 09a119c..3621c6f 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,8 +1,8 @@
 import moment from 'moment';
 
-export const seasonStart = moment('2023-12-12T00:00:00+00:00').utc();
-export const seasonEnd = moment('2024-03-11T00:00:00+00:00').utc();
-export const weekSeasonStart = moment('2023-12-12T00:00:00+00:00').utc();
+export const seasonStart = moment('2024-03-12T00:00:00+00:00').utc();
+export const seasonEnd = moment('2024-06-10T00:00:00+00:00').utc();
+export const weekSeasonStart = moment('2024-03-12T00:00:00+00:00').utc();
 
 export const firebaseConfig = {
   apiKey: 'AIzaSyAWNRqHLhhvhzKl0gkKybocd0nAk2eTlVg',
diff --git a/src/data/changelog.js b/src/data/changelog.js
index 9e1dd11..fd18ef6 100644
--- a/src/data/changelog.js
+++ b/src/data/changelog.js
@@ -1,6 +1,11 @@
 import moment from 'moment';
 
 export default [{
+  date: moment('2024-03-12 00:00:00').utc(),
+  items: [
+    'Update to 2024S2',
+  ],
+}, {
   date: moment('2024-03-06 00:00:00').utc(),
   items: [
     'Update with new categories',
diff --git a/src/data/offWeeks.js b/src/data/offWeeks.js
index b8e2780..bd2efd2 100644
--- a/src/data/offWeeks.js
+++ b/src/data/offWeeks.js
@@ -83,27 +83,6 @@ export default {
   // 4485: {
   //  weekStartOffset: { days: -1 },
   // },
-  // 492 │ 4427 │ Road │ IMSA Michelin Pilot Challenge Series | 2023-12-05
-  // 4427: {
-  //   weekStartOffset: { days: 7 },
-  //   offWeeks: [
-  //     1.1, 2.1, 3.1, 4.1, 5.1,
-  //   ],
-  // },
-  // 331 │ 4458 │ Road │ European Endurance Pure Driving School Series | 2023-12-05
-  // 4458: {
-  //   weekStartOffset: { days: 7 },
-  //   offWeeks: [
-  //     1.1, 2.1, 3.1, 4.1, 5.1,
-  //   ],
-  // },
-
-  // 419 │ 4459 │ Road │ IMSA Endurance Series | 2023-11-28
-  // 4459: {
-  //   offWeeks: [
-  //     1.1, 2.1, 3.1, 4.1, 5.1,
-  //   ],
-  // },
   // 478 │ 4538   │ Oval │ eNASCAR RTP Contender Series
   // 4538: {
   //   weekStartOffset: { days: 6 },
@@ -111,88 +90,68 @@ export default {
   //     6.1,
   //   ],
   // },
-  // 492 │ 4589   │ Road │ C     │ IMSA Michelin Pilot Challenge Series | 2024-03-05
-  4589: {
-    weekStartOffset: { days: 7 },
-    offWeeks: [
-      1.1, 2.1, 3.1, 4.1, 5.1,
-    ],
-  },
-  // 331 │ 4622   │ Road │ B     │ Global Endurance Pure Driving School Tour | 2024-03-05
-  4622: {
-    weekStartOffset: { days: 7 },
-    offWeeks: [
-      1.1, 2.1, 3.1, 4.1, 5.1,
-    ],
-  },
-  // 419 │ 4623   │ Road │ B     │ IMSA Endurance Series | 2024-03-05
-  4623: {
-    offWeeks: [
-      1.1, 2.1, 3.1, 4.1, 5.1,
-    ],
-  },
   // 526 │ 4666   │ Road │ C     │ Ring Meister Ricmotech Series - Fixed | 2024-03-05
-  4666: {
-    carByWeek: [
-      [10009], // 1 Skip Barber Formula 2000
-      [10567], // 2 Audi R8 LMS EVO II GT3
-      [10516], // 3 Hyundai Elantra N TC
-      [10232], // 4 Street Stock
-      [10484], // 5 Chevrolet Corvette C8.R GTE
-      [10497], // 6 McLaren 570S GT4
-      [10011], // 7 Pontiac Solstice
-      [10040], // 8 Radical SR8
-      [10552], // 9 Ligier JS P320
-      [10006], // 10 [Legacy] Pro Mazda
-      [10473], // 11 Porsche 718 Cayman GT4 Clubsport MR
-      [10495], // 12 Lamborghini Huracán GT3 EVO
-    ],
-    carClassShortNameByWeek: [
-      ['SBRS'], // 1 Skip Barber Formula 2000
-      ['Audi R8 EVO2 GT3'], // 2 Audi R8 LMS EVO II GT3
-      ['Elantra N TC'], // 3 Hyundai Elantra N TC
-      ['Street Stock'], // 4 Street Stock
-      ['Vette C8.R GTE'], // 5 Chevrolet Corvette C8.R GTE
-      ['McLaren 570S GT4'], // 6 McLaren 570S GT4
-      ['Solstice'], // 7 Pontiac Solstice
-      ['SR8'], // 8 Radical SR8
-      ['Ligier JS P320'], // 9 Ligier JS P320
-      ['Pro Mazda'], // 10 [Legacy] Pro Mazda
-      ['Porsche 718'], // 11 Porsche 718 Cayman GT4 Clubsport MR
-      ['Lambo Huracán'], // 12 Lamborghini Huracán GT3 EVO
-    ],
-  },
+  // 4666: {
+  //   carByWeek: [
+  //     [10009], // 1 Skip Barber Formula 2000
+  //     [10567], // 2 Audi R8 LMS EVO II GT3
+  //     [10516], // 3 Hyundai Elantra N TC
+  //     [10232], // 4 Street Stock
+  //     [10484], // 5 Chevrolet Corvette C8.R GTE
+  //     [10497], // 6 McLaren 570S GT4
+  //     [10011], // 7 Pontiac Solstice
+  //     [10040], // 8 Radical SR8
+  //     [10552], // 9 Ligier JS P320
+  //     [10006], // 10 [Legacy] Pro Mazda
+  //     [10473], // 11 Porsche 718 Cayman GT4 Clubsport MR
+  //     [10495], // 12 Lamborghini Huracán GT3 EVO
+  //   ],
+  //   carClassShortNameByWeek: [
+  //     ['SBRS'], // 1 Skip Barber Formula 2000
+  //     ['Audi R8 EVO2 GT3'], // 2 Audi R8 LMS EVO II GT3
+  //     ['Elantra N TC'], // 3 Hyundai Elantra N TC
+  //     ['Street Stock'], // 4 Street Stock
+  //     ['Vette C8.R GTE'], // 5 Chevrolet Corvette C8.R GTE
+  //     ['McLaren 570S GT4'], // 6 McLaren 570S GT4
+  //     ['Solstice'], // 7 Pontiac Solstice
+  //     ['SR8'], // 8 Radical SR8
+  //     ['Ligier JS P320'], // 9 Ligier JS P320
+  //     ['Pro Mazda'], // 10 [Legacy] Pro Mazda
+  //     ['Porsche 718'], // 11 Porsche 718 Cayman GT4 Clubsport MR
+  //     ['Lambo Huracán'], // 12 Lamborghini Huracán GT3 EVO
+  //   ],
+  // },
   // 538 │ 4667   │ Oval │ D     │ Draft Master - Fixed | 2024-03-05
-  4667: {
-    carByWeek: [
-      [10481, 10530, 10459], // 1 NASCAR Trucks
-      [10068], // 2 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
-      [10464, 10465, 10466], // 3 NASCAR Xfinity Cars
-      [10527, 10482, 10483, 10566], // 4 NASCAR Classic 1987
-      [10088], // 5 Gen 4 Cup
-      [10503, 10504, 10505], // 6 NASCAR Next Gen
-      [10481, 10530, 10459], // 7 NASCAR Trucks
-      [10068], // 8 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
-      [10464, 10465, 10466], // 9 NASCAR Xfinity Cars
-      [10527, 10482, 10483, 10566], // 10 NASCAR Classic 1987
-      [10088], // 11 Gen 4 Cup
-      [10503, 10504, 10505], // 12 NASCAR Next Gen
-    ],
-    carClassShortNameByWeek: [
-      ['NASCAR Trucks'], // 1 NASCAR Trucks
-      ['[Legacy] NASCAR Cup Chevrolet Impala COT - 2009'], // 2 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
-      ['XFINITY Series'], // 3 NASCAR Xfinity Cars
-      ['NASCAR 1987'], // 4 NASCAR Classic 1987
-      ['Gen 4 Cup'], // 5 Gen 4 Cup
-      ['NASCAR 2022 NG'], // 6 NASCAR Next Gen
-      ['NASCAR Trucks'], // 7 NASCAR Trucks
-      ['[Legacy] NASCAR Cup Chevrolet Impala COT - 2009'], // 8 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
-      ['XFINITY Series'], // 9 NASCAR Xfinity Cars
-      ['NASCAR 1987'], // 10 NASCAR Classic 1987
-      ['Gen 4 Cup'], // 11 Gen 4 Cup
-      ['NASCAR 2022 NG'], // 12 NASCAR Next Gen
-    ],
-  },
+  // 4667: {
+  //   carByWeek: [
+  //     [10481, 10530, 10459], // 1 NASCAR Trucks
+  //     [10068], // 2 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+  //     [10464, 10465, 10466], // 3 NASCAR Xfinity Cars
+  //     [10527, 10482, 10483, 10566], // 4 NASCAR Classic 1987
+  //     [10088], // 5 Gen 4 Cup
+  //     [10503, 10504, 10505], // 6 NASCAR Next Gen
+  //     [10481, 10530, 10459], // 7 NASCAR Trucks
+  //     [10068], // 8 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+  //     [10464, 10465, 10466], // 9 NASCAR Xfinity Cars
+  //     [10527, 10482, 10483, 10566], // 10 NASCAR Classic 1987
+  //     [10088], // 11 Gen 4 Cup
+  //     [10503, 10504, 10505], // 12 NASCAR Next Gen
+  //   ],
+  //   carClassShortNameByWeek: [
+  //     ['NASCAR Trucks'], // 1 NASCAR Trucks
+  //     ['[Legacy] NASCAR Cup Chevrolet Impala COT - 2009'], // 2 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+  //     ['XFINITY Series'], // 3 NASCAR Xfinity Cars
+  //     ['NASCAR 1987'], // 4 NASCAR Classic 1987
+  //     ['Gen 4 Cup'], // 5 Gen 4 Cup
+  //     ['NASCAR 2022 NG'], // 6 NASCAR Next Gen
+  //     ['NASCAR Trucks'], // 7 NASCAR Trucks
+  //     ['[Legacy] NASCAR Cup Chevrolet Impala COT - 2009'], // 8 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+  //     ['XFINITY Series'], // 9 NASCAR Xfinity Cars
+  //     ['NASCAR 1987'], // 10 NASCAR Classic 1987
+  //     ['Gen 4 Cup'], // 11 Gen 4 Cup
+  //     ['NASCAR 2022 NG'], // 12 NASCAR Next Gen
+  //   ],
+  // },
   // 207 │ 4703 │ NASCAR iRacing Series - Fixed | 2024-11-12
   4703: {
     offWeeks: [
@@ -229,4 +188,90 @@ export default {
       1.1, 2.1, 2.1, 2.1, 4.1, 5.1, 8.1, 9.1, 12.1, 12.1, 12.1, 15.1,
     ],
   },
+  // Prelim Draft Master - Fixed
+  99998: {
+    carByWeek: [
+      [10068], // 1 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      [10481, 10530, 10459], // 2 NASCAR Trucks
+      [10527, 10482, 10483, 10566], // 3 NASCAR Classic 1987
+      [10503, 10504, 10505], // 4 NASCAR Next Gen
+      [10068], // 5 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      [10481, 10530, 10459], // 6 NASCAR Trucks
+      [10527, 10482, 10483, 10566], // 7 NASCAR Classic 1987
+      [10503, 10504, 10505], // 8 NASCAR Next Gen
+      [10068], // 9 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      [10481, 10530, 10459], // 10 NASCAR Trucks
+      [10527, 10482, 10483, 10566], // 11 NASCAR Classic 1987
+      [10503, 10504, 10505], // 12 NASCAR Next Gen
+    ],
+    carClassShortNameByWeek: [
+      ['[Legacy] NASCAR Cup Chevrolet Impala COT - 2009'], // 1 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      ['NASCAR Trucks'], // 2 NASCAR Trucks
+      ['NASCAR 1987'], // 3 NASCAR Classic 1987
+      ['NASCAR 2022 NG'], // 4 NASCAR Next Gen
+      ['[Legacy] NASCAR Cup Chevrolet Impala COT - 2009'], // 5 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      ['NASCAR Trucks'], // 6 NASCAR Trucks
+      ['NASCAR 1987'], // 7 NASCAR Classic 1987
+      ['NASCAR 2022 NG'], // 8 NASCAR Next Gen
+      ['[Legacy] NASCAR Cup Chevrolet Impala COT - 2009'], // 9 [Legacy] NASCAR Cup Chevrolet Impala COT - 2009
+      ['NASCAR Trucks'], // 10 NASCAR Trucks
+      ['NASCAR 1987'], // 11 NASCAR Classic 1987
+      ['NASCAR 2022 NG'], // 12 NASCAR Next Gen
+    ],
+  },
+  // Prelim Ring Meister
+  99999: {
+    carByWeek: [
+      [10306], // 1 Cadillac CTS-V Racecar
+      [10548], // 2 Renault Clio
+      [10552], // 3 Ligier JS P320
+      [10110], // 4 Lotus 79
+      [10517], // 5 Honda Civic Type R TCR
+      [10457], // 6 BMW M8 GTE
+      [10524], // 7 Stock Car Brasil Chevrolet Cruze
+      [10394], // 8 Global Mazda MX-5 Cup
+      [10113], // 9 Chevrolet Corvette C6.R GT
+      [10563], // 10 Ferrari 296 GT3
+      [10040], // 11 Radical SR8
+      [null], // 12 ??????
+    ],
+    carClassShortNameByWeek: [
+      ['Cadillac CTS-VR'], // 1 Cadillac CTS-V Racecar
+      ['Renault Clio'], // 2 Renault Clio
+      ['Ligier JS P320'], // 3 Ligier JS P320
+      ['Lotus 79'], // 4 Lotus 79
+      ['Civic Type R'], // 5 Honda Civic Type R TCR
+      ['BMW M8 GTE'], // 6 BMW M8 GTE
+      ['Stock Car Brasil'], // 7 Stock Car Brasil Chevrolet Cruze
+      ['MX5 Cup 2016'], // 8 Global Mazda MX-5 Cup
+      ['C6R GT1'], // 9 Chevrolet Corvette C6.R GT
+      ['Ferrari 296 GT3'], // 10 Ferrari 296 GT3
+      ['SR8'], // 11 Radical SR8
+      [null], // 12 ?????
+    ],
+  },
+  // 557 │ 4825   │ Sports Car  │ D     │ BMW M Power Tour - Fixed | 2024-06-04
+  4825: {
+    weekEndOffset: { days: 7 },
+  },
+  // 492 │ 4755   │ Sports Car  │ C     │ IMSA Michelin Pilot Challenge Series | 2024-06-04
+  4755: {
+    weekStartOffset: { days: 7 },
+    offWeeks: [
+      1.1, 2.1, 3.1, 4.1, 5.1,
+    ],
+  },
+  // 331 │ 4778   │ Sports Car  │ B     │ Global Endurance CONSPIT Tour  | 2024-06-04
+  4778: {
+    weekStartOffset: { days: 7 },
+    offWeeks: [
+      1.1, 2.1, 3.1, 4.1, 5.1,
+    ],
+  },
+  // 419 │ 4782   │ Sports Car  │ B     │ IMSA Endurance Series  | 2024-05-28
+  4782: {
+    offWeeks: [
+      1.1, 2.1, 3.1, 4.1, 5.1,
+    ],
+  },
 };