diff --git a/go.work.sum b/go.work.sum
index 6f04a850a..2feb6f37d 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -111,7 +111,9 @@ github.com/gobwas/ws v1.2.1 h1:F2aeBZrm2NDsc7vbovKrWSogd4wvfAxg0FQ89/iqOTk=
 github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/pprof v0.0.0-20230811205829-9131a7e9cc17/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
@@ -350,6 +352,7 @@ golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw
 golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
 golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 google.golang.org/api v0.215.0 h1:jdYF4qnyczlEz2ReWIsosNLDuzXyvFHJtI5gcr0J7t0=
 google.golang.org/api v0.215.0/go.mod h1:fta3CVtuJYOEdugLNWm6WodzOS8KdFckABwN4I40hzY=
@@ -365,6 +368,7 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
 google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
diff --git a/web/template/partial/course/manage/create-lecture-form-slides/lecture-details-slide.gohtml b/web/template/partial/course/manage/create-lecture-form-slides/lecture-details-slide.gohtml
index 05419ad8c..a5980cbea 100644
--- a/web/template/partial/course/manage/create-lecture-form-slides/lecture-details-slide.gohtml
+++ b/web/template/partial/course/manage/create-lecture-form-slides/lecture-details-slide.gohtml
@@ -17,9 +17,66 @@
         </label>
     </div>
 
-    <label for="name" x-show="!loading">
+    {{- /* Video Upload Mode - Batch UI */ -}}
+    <div x-show="formData.vodup && !loading" class="col-span-full">
+        <div class="space-y-3">
+            <template x-for="(lecture, index) in formData.batchLectures" :key="index">
+                <div class="flex gap-2 items-start">
+                    <div class="flex-1 grid grid-cols-2 gap-2">
+                        <label>
+                            <span class="text-sm text-5">Lecture Name</span>
+                            <input type="text" class="tl-input" x-model="lecture.title" 
+                                   @input="onUpdate"
+                                   @keydown.enter.prevent="$event.target.blur()" 
+                                   placeholder="L01: Binary Trees"/>
+                        </label>
+                        <label>
+                            <span class="text-sm text-5">Start Time</span>
+                            <input type="text" class="tl-input" 
+                                   x-model="lecture.start"
+                                   x-init="$nextTick(() => { 
+                                       if ($el && !$el._flatpickr) {
+                                           const fp = flatpickr($el, {
+                                               enableTime: true, 
+                                               time_24hr: true, 
+                                               altInput: true, 
+                                               altFormat: 'Y-m-d H:i', 
+                                               dateFormat: 'Z', 
+                                               allowInput: true,
+                                               onChange: function(selectedDates, dateStr) {
+                                                   lecture.start = dateStr;
+                                                   onUpdate();
+                                               }
+                                           }); 
+                                       } 
+                                   })"
+                                   @input="onUpdate"
+                                   @keydown.enter.prevent="$event.target.blur()" 
+                                   placeholder="2024-01-08 14:00"/>
+                        </label>
+                    </div>
+                    <button type="button" @click="removeBatchLectureRow(index)" 
+                            x-show="formData.batchLectures.length > 1"
+                            class="mt-6 text-red-500 hover:text-red-700 px-2" title="Remove">
+                        <i class="fas fa-trash"></i>
+                    </button>
+                </div>
+            </template>
+        </div>
+        <div class="mt-3 flex justify-center">
+            <button type="button" @click="addBatchLectureRow" class="text-sm text-blue-500 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
+                <i class="fas fa-plus-circle mr-1"></i> Add Another Lecture
+            </button>
+        </div>
+    </div>
+
+    {{- /* Non-Video Upload Mode UI */ -}}
+    <label for="name" x-show="!loading && !formData.vodup">
         <span class="text-sm text-5">Lecture Name</span>
-        <input class="tl-input" name="name" id="name" x-model="formData.title" @change="onUpdate" placeholder="L01: Binary Trees"/>
+        <input class="tl-input" name="name" id="name" x-model="formData.title" 
+               @input="onUpdate" 
+               @keydown.enter.prevent="$event.target.blur()" 
+               placeholder="L01: Binary Trees"/>
     </label>
 
     <label x-show="!formData.premiere && !formData.vodup && !loading">
@@ -35,12 +92,23 @@
         </select>
     </label>
 
-    <label for="start" x-show="!loading && !formData.adHoc">
+    <label for="start" x-show="!loading && !formData.adHoc && !formData.vodup">
         <span class="text-sm text-5">Start</span>
         <input class="tl-input" name="start" placeholder="2021-04-08 14:00" id="start" x-model="formData.start"
                x-ref="start"
-               x-init="flatpickr($refs.start, {enableTime: true, time_24hr: true, altInput:true, altFormat:'Y-m-d H:i', dateFormat:'Z', allowInput: true})"
-               @change="onStartChange"/>
+               x-init="flatpickr($refs.start, {
+                   enableTime: true, 
+                   time_24hr: true, 
+                   altInput: true, 
+                   altFormat: 'Y-m-d H:i', 
+                   dateFormat: 'Z', 
+                   allowInput: true,
+                   onChange: function(selectedDates, dateStr) {
+                       formData.start = dateStr;
+                       onStartChange();
+                   }
+               })"
+               @input="onStartChange"/>
     </label>
     <template x-if="!formData.premiere && !formData.vodup && !loading">
         <label for="end">
@@ -48,8 +116,18 @@
             <span x-show="formData.formatedDuration !== ''" class="text-sm font-light opacity-75"
                   x-text="`( ${formData.formatedDuration} )`"></span>
             <input class="tl-input" name="end" placeholder="16:00" id="end" x-model="formData.end" x-ref="end"
-                   x-init="flatpickr($refs.end, {enableTime: true, noCalendar: true, dateFormat: 'H:i', time_24hr: true, allowInput: true })"
-                   @change="onEndChange"/>
+                   x-init="flatpickr($refs.end, {
+                       enableTime: true, 
+                       noCalendar: true, 
+                       dateFormat: 'H:i', 
+                       time_24hr: true, 
+                       allowInput: true,
+                       onChange: function(selectedDates, dateStr) {
+                           formData.end = dateStr;
+                           onEndChange();
+                       }
+                   })"
+                   @input="onEndChange"/>
         </label>
     </template>
 
diff --git a/web/template/partial/course/manage/create-lecture-form-slides/lecture-media-slide.gohtml b/web/template/partial/course/manage/create-lecture-form-slides/lecture-media-slide.gohtml
index dc32efa2f..7a9fcd6e2 100644
--- a/web/template/partial/course/manage/create-lecture-form-slides/lecture-media-slide.gohtml
+++ b/web/template/partial/course/manage/create-lecture-form-slides/lecture-media-slide.gohtml
@@ -1,34 +1,82 @@
 {{define "lecture-media-slide"}}
-    <div class="mb-4">
-        <label x-show="formData.premiere || formData.vodup && !loading">
-            <span class="text-sm text-5">Combined Video (mp4, if possible h264)</span>
-            <label class="flex">
-                <input x-ref="fileSelection1" type="file" accept="video/mp4" class="btn tl-choose-file mt-2 mx-2 w-full"
-                       x-on:change="updateFiles('COMB', Object.values($event.target.files));">
-                <button type="button" title="Deselect File" class="fa fa-trash mt-2 mx-2" @click="updateFiles('COMB', []);$refs.fileSelection1.value = '';"></button>
-            </label>
-        </label>
+    {{- /* Batch/Multi-lecture Upload UI (for vodup) */ -}}
+    <div x-show="formData.vodup && !loading" class="space-y-6">
+        <template x-for="(lecture, index) in formData.batchLectures" :key="index">
+            <div class="p-4 bg-gray-50 dark:bg-gray-700 rounded border border-gray-200 dark:border-gray-600">
+                <h3 class="text-lg font-semibold mb-3 text-gray-800 dark:text-gray-200" x-text="`${index + 1}. ${lecture.title || 'Untitled Lecture'}`"></h3>
+                
+                <div class="mb-4">
+                    <label>
+                        <span class="text-sm text-5">Combined Video (mp4, if possible h264)</span>
+                        <label class="flex">
+                            <input type="file" accept="video/mp4" class="btn tl-choose-file mt-2 mx-2 w-full"
+                                   x-on:change="updateBatchLectureFiles(index, 'COMB', Object.values($event.target.files));">
+                            <button type="button" title="Deselect File" class="fa fa-trash mt-2 mx-2" 
+                                    @click="updateBatchLectureFiles(index, 'COMB', []);$event.target.previousElementSibling.value = '';"></button>
+                        </label>
+                    </label>
+                </div>
+
+                <div class="mb-4">
+                    <label>
+                        <span class="text-sm text-5">Presentation Video (mp4, if possible h264)</span>
+                        <label class="flex">
+                            <input type="file" accept="video/mp4" class="btn tl-choose-file mt-2 mx-2 w-full"
+                                   x-on:change="updateBatchLectureFiles(index, 'PRES', Object.values($event.target.files));">
+                            <button type="button" title="Deselect File" class="fa fa-trash mt-2 mx-2" 
+                                    @click="updateBatchLectureFiles(index, 'PRES', []);$event.target.previousElementSibling.value = '';"></button>
+                        </label>
+                    </label>
+                </div>
+
+                <div>
+                    <label>
+                        <span class="text-sm text-5">Camera Video (mp4, if possible h264)</span>
+                        <label class="flex">
+                            <input type="file" accept="video/mp4" class="btn tl-choose-file mt-2 mx-2 w-full"
+                                   x-on:change="updateBatchLectureFiles(index, 'CAM', Object.values($event.target.files));">
+                            <button type="button" title="Deselect File" class="fa fa-trash mt-2 mx-2" 
+                                    @click="updateBatchLectureFiles(index, 'CAM', []);$event.target.previousElementSibling.value = '';"></button>
+                        </label>
+                    </label>
+                </div>
+            </div>
+        </template>
     </div>
 
-    <div class="mb-4">
-        <label x-show="formData.premiere || formData.vodup && !loading">
-            <span class="text-sm text-5">Presentation Video (mp4, if possible h264)</span>
-            <label class="flex">
-                <input x-ref="fileSelection2" type="file" accept="video/mp4" class="btn tl-choose-file mt-2 mx-2 w-full"
-                       x-on:change="updateFiles('PRES', Object.values($event.target.files));">
-                <button type="button" title="Deselect File" class="fa fa-trash mt-2 mx-2" @click="updateFiles('PRES', []);$refs.fileSelection2.value = '';"></button>
+    {{- /* Other Modes (Premiere/Record) */ -}}
+    <div x-show="!formData.vodup">
+        <div class="mb-4">
+            <label x-show="formData.premiere || formData.vodup && !loading">
+                <span class="text-sm text-5">Combined Video (mp4, if possible h264)</span>
+                <label class="flex">
+                    <input x-ref="fileSelection1" type="file" accept="video/mp4" class="btn tl-choose-file mt-2 mx-2 w-full"
+                           x-on:change="updateFiles('COMB', Object.values($event.target.files));">
+                    <button type="button" title="Deselect File" class="fa fa-trash mt-2 mx-2" @click="updateFiles('COMB', []);$refs.fileSelection1.value = '';"></button>
+                </label>
             </label>
-        </label>
-    </div>
+        </div>
+
+        <div class="mb-4">
+            <label x-show="formData.premiere || formData.vodup && !loading">
+                <span class="text-sm text-5">Presentation Video (mp4, if possible h264)</span>
+                <label class="flex">
+                    <input x-ref="fileSelection2" type="file" accept="video/mp4" class="btn tl-choose-file mt-2 mx-2 w-full"
+                           x-on:change="updateFiles('PRES', Object.values($event.target.files));">
+                    <button type="button" title="Deselect File" class="fa fa-trash mt-2 mx-2" @click="updateFiles('PRES', []);$refs.fileSelection2.value = '';"></button>
+                </label>
+            </label>
+        </div>
 
-    <div>
-        <label x-show="formData.premiere || formData.vodup && !loading">
-            <span class="text-sm text-5">Camera Video (mp4, if possible h264)</span>
-            <label class="flex">
-                <input x-ref="fileSelection3" type="file" accept="video/mp4" class="btn tl-choose-file mt-2 mx-2 w-full"
-                       x-on:change="updateFiles('CAM', Object.values($event.target.files));">
-                <button type="button" title="Deselect File" class="fa fa-trash mt-2 mx-2" @click="updateFiles('CAM', []);$refs.fileSelection3.value = '';"></button>
+        <div>
+            <label x-show="formData.premiere || formData.vodup && !loading">
+                <span class="text-sm text-5">Camera Video (mp4, if possible h264)</span>
+                <label class="flex">
+                    <input x-ref="fileSelection3" type="file" accept="video/mp4" class="btn tl-choose-file mt-2 mx-2 w-full"
+                           x-on:change="updateFiles('CAM', Object.values($event.target.files));">
+                    <button type="button" title="Deselect File" class="fa fa-trash mt-2 mx-2" @click="updateFiles('CAM', []);$refs.fileSelection3.value = '';"></button>
+                </label>
             </label>
-        </label>
+        </div>
     </div>
 {{end}}
\ No newline at end of file
diff --git a/web/template/partial/course/manage/create-lecture-form.gohtml b/web/template/partial/course/manage/create-lecture-form.gohtml
index f02364d93..b414a86d4 100644
--- a/web/template/partial/course/manage/create-lecture-form.gohtml
+++ b/web/template/partial/course/manage/create-lecture-form.gohtml
@@ -36,31 +36,72 @@
 
         <div class="form-container-body">
             {{- /* Loading Tab */ -}}
-            <div x-show="currentTab === -1" x-data="{ progress: { COMB: 0, PRES: null, CAM: null } }" @voduploadprogress.window="(e) => (progress = e.detail)">
-                <h3>Your lecture is being created ...</h3>
-                <ul x-show="formData.vodup" class="mt-2">
-                    <li class="mb-4">
-                        <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">Combined Video:</span>
-                        <progress x-bind:value="progress.COMB !== null ? progress.COMB : 0" max="100" 
-                            class="w-full h-2 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden">
-                        </progress>
-                        <span class="block mt-1 text-xs text-gray-500 dark:text-gray-400" x-text="progress.COMB === null ? 'Skipped' : `${progress.COMB}%`"></span>
-                    </li>
-                    <li class="mb-4">
-                        <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">Presentation Video:</span>
-                        <progress x-bind:value="progress.PRES !== null ? progress.PRES : 0" max="100" 
-                            class="w-full h-2 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden">
-                        </progress>
-                        <span class="block mt-1 text-xs text-gray-500 dark:text-gray-400" x-text="progress.PRES === null ? 'Skipped' : `${progress.PRES}%`"></span>
-                    </li>
-                    <li class="mb-4">
-                        <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">Camera Video:</span>
-                        <progress x-bind:value="progress.CAM !== null ? progress.CAM : 0" max="100" 
-                            class="w-full h-2 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden">
-                        </progress>
-                        <span class="block mt-1 text-xs text-gray-500 dark:text-gray-400" x-text="progress.CAM === null ? 'Skipped' : `${progress.CAM}%`"></span>
-                    </li>
-                </ul>
+            <div x-show="currentTab === -1" x-data="{ progress: { COMB: 0, PRES: null, CAM: null }, batchProgress: { lectureIndex: 0, lectureTitle: '', totalLectures: 0, phase: '', files: { COMB: 0, PRES: null, CAM: null } } }" 
+                 @voduploadprogress.window="(e) => (progress = e.detail)"
+                 @batchvoduploadprogress.window="(e) => (batchProgress = e.detail)">
+                
+                {{- /* Single Upload Progress */ -}}
+                <div x-show="!formData.vodup || formData.batchLectures.length === 1">
+                    <h3>Your lecture is being created ...</h3>
+                    <ul x-show="formData.vodup" class="mt-2">
+                        <li class="mb-4">
+                            <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">Combined Video:</span>
+                            <progress x-bind:value="progress.COMB !== null ? progress.COMB : 0" max="100" 
+                                class="w-full h-2 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden">
+                            </progress>
+                            <span class="block mt-1 text-xs text-gray-500 dark:text-gray-400" x-text="progress.COMB === null ? 'Skipped' : `${progress.COMB}%`"></span>
+                        </li>
+                        <li class="mb-4">
+                            <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">Presentation Video:</span>
+                            <progress x-bind:value="progress.PRES !== null ? progress.PRES : 0" max="100" 
+                                class="w-full h-2 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden">
+                            </progress>
+                            <span class="block mt-1 text-xs text-gray-500 dark:text-gray-400" x-text="progress.PRES === null ? 'Skipped' : `${progress.PRES}%`"></span>
+                        </li>
+                        <li class="mb-4">
+                            <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">Camera Video:</span>
+                            <progress x-bind:value="progress.CAM !== null ? progress.CAM : 0" max="100" 
+                                class="w-full h-2 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden">
+                            </progress>
+                            <span class="block mt-1 text-xs text-gray-500 dark:text-gray-400" x-text="progress.CAM === null ? 'Skipped' : `${progress.CAM}%`"></span>
+                        </li>
+                    </ul>
+                </div>
+
+                {{- /* Batch Upload Progress */ -}}
+                <div x-show="formData.vodup && formData.batchLectures.length > 1">
+                    <h3>Uploading lectures ...</h3>
+                    <p class="text-sm text-gray-600 dark:text-gray-400 mt-2" x-show="batchProgress.phase === 'creating'">
+                        Creating streams... (<span x-text="batchProgress.lectureIndex + 1"></span> of <span x-text="batchProgress.totalLectures"></span>)
+                    </p>
+                    <p class="text-sm text-gray-600 dark:text-gray-400 mt-2" x-show="batchProgress.phase === 'uploading'">
+                        Uploading: <span class="font-semibold" x-text="batchProgress.lectureTitle"></span> 
+                        (<span x-text="batchProgress.lectureIndex + 1"></span> of <span x-text="batchProgress.totalLectures"></span>)
+                    </p>
+                    <ul x-show="batchProgress.phase === 'uploading'" class="mt-4">
+                        <li class="mb-4">
+                            <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">Combined Video:</span>
+                            <progress x-bind:value="batchProgress.files.COMB !== null ? batchProgress.files.COMB : 0" max="100" 
+                                class="w-full h-2 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden">
+                            </progress>
+                            <span class="block mt-1 text-xs text-gray-500 dark:text-gray-400" x-text="batchProgress.files.COMB === null ? 'Skipped' : `${batchProgress.files.COMB}%`"></span>
+                        </li>
+                        <li class="mb-4">
+                            <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">Presentation Video:</span>
+                            <progress x-bind:value="batchProgress.files.PRES !== null ? batchProgress.files.PRES : 0" max="100" 
+                                class="w-full h-2 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden">
+                            </progress>
+                            <span class="block mt-1 text-xs text-gray-500 dark:text-gray-400" x-text="batchProgress.files.PRES === null ? 'Skipped' : `${batchProgress.files.PRES}%`"></span>
+                        </li>
+                        <li class="mb-4">
+                            <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">Camera Video:</span>
+                            <progress x-bind:value="batchProgress.files.CAM !== null ? batchProgress.files.CAM : 0" max="100" 
+                                class="w-full h-2 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden">
+                            </progress>
+                            <span class="block mt-1 text-xs text-gray-500 dark:text-gray-400" x-text="batchProgress.files.CAM === null ? 'Skipped' : `${batchProgress.files.CAM}%`"></span>
+                        </li>
+                    </ul>
+                </div>
             </div>
 
             {{- /* Tab 1 */ -}}
diff --git a/web/ts/edit-course.ts b/web/ts/edit-course.ts
index b618a4606..10673032e 100644
--- a/web/ts/edit-course.ts
+++ b/web/ts/edit-course.ts
@@ -850,6 +850,7 @@ export function createLectureForm(args: { s: [] }) {
             combFile: [],
             presFile: [],
             camFile: [],
+            batchLectures: [{ title: "", start: "", combFile: [], presFile: [], camFile: [] }],
         },
         streams: args.s,
         loading: false,
@@ -878,6 +879,11 @@ export function createLectureForm(args: { s: [] }) {
         updateCreateType(newType: LectureCreateType) {
             this.createType = newType;
             this.formData.vodup = newType !== LectureCreateType.livestream;
+            // Reset batchLectures when switching modes
+            if (this.formData.vodup) {
+                this.formData.batchLectures = [{ title: "", start: "", combFile: [], presFile: [], camFile: [] }];
+            }
+            this.onUpdate();
         },
         updateLiveAdHoc(adHoc: boolean) {
             this.formData.adHoc = adHoc;
@@ -930,6 +936,29 @@ export function createLectureForm(args: { s: [] }) {
             this.onUpdate();
         },
 
+        addBatchLectureRow() {
+            this.formData.batchLectures.push({ title: "", start: "", combFile: [], presFile: [], camFile: [] });
+            this.onUpdate();
+        },
+
+        removeBatchLectureRow(index: number) {
+            if (this.formData.batchLectures.length > 1) {
+                this.formData.batchLectures.splice(index, 1);
+                this.onUpdate();
+            }
+        },
+
+        updateBatchLectureFiles(lectureIndex: number, type: string, files: File[]) {
+            if (type === "COMB") {
+                this.formData.batchLectures[lectureIndex].combFile = files;
+            } else if (type === "CAM") {
+                this.formData.batchLectures[lectureIndex].camFile = files;
+            } else if (type === "PRES") {
+                this.formData.batchLectures[lectureIndex].presFile = files;
+            }
+            this.onUpdate();
+        },
+
         // This function sets flags depending on the current tab and current data
         onUpdate() {
             this.error = false;
@@ -945,13 +974,22 @@ export function createLectureForm(args: { s: [] }) {
             if (this.currentTab === 1) {
                 this.onLastSlide = false;
                 if (this.formData.vodup) {
-                    // If user has chosen video on demand, there are 3 tabs (file upload tab)
-                    // => we are not on the last tab
+                    // Video upload mode - validate all lecture entries in batchLectures
                     this.canGoBack = true;
-                    this.canContinue = this.formData.start.length > 0;
-                    this.cannotContinueReason = "";
-                    if (this.formData.start.length <= 0) {
-                        this.cannotContinueReason += "The start time for the lecture has not been set yet!\n";
+
+                    const validLectures = this.formData.batchLectures.filter((lec) => lec.start.trim().length > 0);
+                    const invalidLectures = this.formData.batchLectures.filter((lec) => lec.start.trim().length === 0);
+
+                    if (validLectures.length === 0) {
+                        this.canContinue = false;
+                        this.cannotContinueReason = "The start time for the lecture has not been set yet!\n";
+                    } else if (invalidLectures.length > 0) {
+                        this.canContinue = false;
+                        this.cannotContinueReason =
+                            "Please specify a start time for all lectures or remove empty rows!\n";
+                    } else {
+                        this.canContinue = true;
+                        this.cannotContinueReason = "";
                     }
                 } else {
                     this.onLastSlide = true;
@@ -969,15 +1007,31 @@ export function createLectureForm(args: { s: [] }) {
             }
 
             if (this.currentTab === 2) {
-                this.canContinue =
-                    (this.getMediaFiles().length > 0 && this.formData.vodup) ||
-                    (this.formData.adHoc && this.formData.end != "");
-                this.cannotContinueReason = "";
-                if (this.formData.vodup && this.getMediaFiles().length <= 0) {
-                    this.cannotContinueReason += "No media files!\n";
-                }
-                if (this.formData.adHoc && this.formData.end == "") {
-                    this.cannotContinueReason += "The end time for the lecture has not been set yet!\n";
+                if (this.formData.vodup) {
+                    // Video upload mode - validate files for valid lectures
+                    const validLectures = this.formData.batchLectures.filter((lec) => lec.start.trim().length > 0);
+                    const invalidLectures = this.formData.batchLectures.filter((lec) => lec.start.trim().length === 0);
+
+                    if (validLectures.length === 0 || invalidLectures.length > 0) {
+                        this.canContinue = false;
+                        this.cannotContinueReason =
+                            "Please specify a start time for all lectures or remove empty rows!\n";
+                    } else {
+                        const allHaveFiles = validLectures.every(
+                            (lec) => lec.combFile.length > 0 || lec.presFile.length > 0 || lec.camFile.length > 0,
+                        );
+                        this.canContinue = allHaveFiles;
+                        this.cannotContinueReason = "";
+                        if (!allHaveFiles) {
+                            this.cannotContinueReason = "All lectures must have at least one video file!\n";
+                        }
+                    }
+                } else if (this.formData.adHoc && this.formData.end != "") {
+                    this.canContinue = true;
+                    this.cannotContinueReason = "";
+                } else {
+                    this.canContinue = false;
+                    this.cannotContinueReason = "The end time for the lecture has not been set yet!\n";
                 }
 
                 this.canGoBack = true;
@@ -1057,16 +1111,18 @@ export function createLectureForm(args: { s: [] }) {
 
             if (this.formData.vodup) {
                 try {
-                    const streamId = await this.uploadVod();
+                    const streamIds = await this.uploadBatchVods();
                     const url = new URL(window.location.href);
-                    url.hash = `lectures:${streamId}`;
+                    url.hash = `lectures:${streamIds.join(",")}`;
                     window.location.assign(url);
                     window.location.reload();
                 } catch (e) {
+                    console.error("Batch upload error:", e);
                     this.currentTab = currentTab;
                     this.loading = false;
                     this.error = true;
                 }
+                return;
             } else {
                 const payload = {
                     title: this.formData.title,
@@ -1161,6 +1217,98 @@ export function createLectureForm(args: { s: [] }) {
 
             return streamID;
         },
+
+        async uploadBatchVods(): Promise<number[]> {
+            const streamIds: number[] = [];
+            const createdStreamIds: number[] = [];
+
+            // Filter to lectures with start time set
+            const lecturesToUpload = this.formData.batchLectures.filter((lec) => lec.start.trim().length > 0);
+
+            if (lecturesToUpload.length === 0) {
+                throw new Error("No lectures to upload");
+            }
+
+            try {
+                // Step 1: Create all VOD streams
+                for (let i = 0; i < lecturesToUpload.length; i++) {
+                    const lecture = lecturesToUpload[i];
+                    const { streamID } = await (
+                        await postData(
+                            `/api/course/${this.courseID}/createVOD?start=${encodeURIComponent(lecture.start)}&title=${encodeURIComponent(lecture.title)}`,
+                            {},
+                        )
+                    ).json();
+                    streamIds.push(streamID);
+                    createdStreamIds.push(streamID);
+
+                    // Dispatch progress for batch creation
+                    window.dispatchEvent(
+                        new CustomEvent("batchvoduploadprogress", {
+                            detail: {
+                                lectureIndex: i,
+                                lectureTitle: lecture.title || `Lecture ${i + 1}`,
+                                totalLectures: lecturesToUpload.length,
+                                phase: "creating",
+                            },
+                        }),
+                    );
+                }
+
+                // Step 2: Upload files for each stream
+                for (let i = 0; i < lecturesToUpload.length; i++) {
+                    const lecture = lecturesToUpload[i];
+                    const streamID = streamIds[i];
+
+                    const mediaUploads: MediaUpload[] = [];
+                    if (lecture.combFile.length > 0)
+                        mediaUploads.push({ file: lecture.combFile[0], type: "COMB", progress: 0 });
+                    if (lecture.presFile.length > 0)
+                        mediaUploads.push({ file: lecture.presFile[0], type: "PRES", progress: 0 });
+                    if (lecture.camFile.length > 0)
+                        mediaUploads.push({ file: lecture.camFile[0], type: "CAM", progress: 0 });
+
+                    for (const mediaUpload of mediaUploads) {
+                        await uploadFile(
+                            `/api/course/${this.courseID}/uploadVODMedia?streamID=${streamID}&videoType=${mediaUpload.type}`,
+                            mediaUpload.file,
+                            {
+                                onProgress: (progress) => {
+                                    mediaUpload.progress = progress;
+                                    // Dispatch progress for individual file upload
+                                    const fileProgress = {
+                                        COMB: mediaUploads.find((e) => e.type == "COMB")?.progress ?? null,
+                                        PRES: mediaUploads.find((e) => e.type == "PRES")?.progress ?? null,
+                                        CAM: mediaUploads.find((e) => e.type == "CAM")?.progress ?? null,
+                                    };
+                                    window.dispatchEvent(
+                                        new CustomEvent("batchvoduploadprogress", {
+                                            detail: {
+                                                lectureIndex: i,
+                                                lectureTitle: lecture.title || `Lecture ${i + 1}`,
+                                                totalLectures: lecturesToUpload.length,
+                                                phase: "uploading",
+                                                files: fileProgress,
+                                            },
+                                        }),
+                                    );
+                                },
+                            },
+                        );
+                    }
+                }
+
+                return streamIds;
+            } catch (e) {
+                // Rollback: delete all created streams
+                if (createdStreamIds.length > 0) {
+                    await postData(`/api/course/${this.courseID}/deleteLectures`, {
+                        streamIDs: createdStreamIds,
+                    });
+                }
+                throw e;
+            }
+        },
     };
 }