diff --git a/movie.sh.in b/movie.sh.in
index 2382fb2..2bbd796 100755
--- a/movie.sh.in
+++ b/movie.sh.in
@@ -7,45 +7,6 @@ jpegize() {
 	DNG_DIR="$1"
 	BURST_DIR="$GIGA_DIR/sm/"
 	mkdir $BURST_DIR
-
-	DCRAW=dcraw
-	TIFF_EXT="tiff"
-	set --
-
-	CONVERT="convert"
-
-	cd $DNG_DIR
-	I=0
-	NUM=0
-	for DNG in *.dng; do
-		NUM=$[$NUM+1]
-	done
-
-	for DNG in *.dng; do
-		PERC=$[(50*$I)/$NUM]
-		echo Message: ${PERC}%
-		BASE=${DNG%%.dng}
-		# -w		Use camera white balance
-		# +M		use embedded color matrix
-		# -H 2		Recover highlights by blending them
-		# -o 1		Output in sRGB colorspace
-		# -q 0		Debayer with fast bi-linear interpolation
-		# -f		Interpolate RGGB as four colors
-		# -T		Output TIFF
-		(
-			$DCRAW -w +M -H 2 -o 1 -q 0 -f -T "$DNG"
-			$CONVERT "$BASE.tiff" "$BASE.jpeg"
-			rm "$BASE.tiff"
-			mv "$BASE.jpeg" "$BURST_DIR/$BASE.jpeg.sv"
-		) &
-		# dcraw -h -> half size -- fast!
-		# can do ppm output
-		I=$[$I+1]
-		if [ 0 == $[ $I % 16 ] ]; then
-			echo "Batch $I -- $PERC %" 1>&2
-			wait
-		fi
-	done
 }
 
 SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
@@ -66,7 +27,9 @@ if [ "-$1" == "-start" ]; then
 elif [ "-$1" == "-stop" ]; then
 	mkdir $GIGA_DIR/sm
 	kill `cat $2/audio.pid`
-	jpegize $2 # | zenity --progress "--text=Converting, phase 1, dng -> jpeg" --time-remaining
+	cd $GIGA_DIR
+	echo Message: Jp
+	@LIBEXECDIR@/mpegize.py jpegize $GIGA_DIR/ $FPS
 	echo Message: Mp
 	cd $GIGA_DIR/sm
 	@LIBEXECDIR@/mpegize.py convertall $GIGA_DIR/ $FPS
diff --git a/mpegize.py b/mpegize.py
index e68e1c2..5529e57 100755
--- a/mpegize.py
+++ b/mpegize.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-# Copyright 2022 Pavel Machek, GPLv2+
+# Copyright 2022, 2024 Pavel Machek, GPLv2+
 
 import os, sys, time, copy, subprocess
 
@@ -64,7 +64,9 @@ class Mpegize:
                 m.stat_gaps("sa")
                 return
             if mode == "jpegize":
+                m.prepare()
                 m.jpegize()
+                return
         m.help()
 
     def stat_gaps(m, e):
@@ -212,8 +214,8 @@ class Mpegize:
 
     def jpegize(m):
         i = 0
-        os.chdir(m.source)
-        l = os.listdir(m.source)
+        os.chdir(m.base)
+        l = os.listdir(m.base)
         l = filter(lambda n: n[-4:] == ".dng", l)
         l = list(l)
         l.sort()
@@ -235,7 +237,7 @@ class Mpegize:
                             '-T', n])  # -T Output TIFF
             subprocess.run(['convert', base+'.tiff', base+'.jpeg'])
             os.unlink(base+'.tiff')
-            os.rename(base+'.jpeg', base+'.jpeg.sv')
+            os.rename(base+'.jpeg', m.source+"/"+base+'.jpeg.sv')
 
 m = Mpegize()
 m.run(sys.argv)