diff --git a/Rollercoaster.singe b/Rollercoaster.singe
index 9279267..0afd51f 100644
--- a/Rollercoaster.singe
+++ b/Rollercoaster.singe
@@ -14,6 +14,10 @@
 	Singe version based on web port by Scott Lawrence.
 	https://www.umlautllama.com/projects/Rollercoaster/
 	
+	"Rollercoaster"(1977) is used without permission but probably considered 
+	fair use under 17 U.S.C. § 107, "for nonprofit educational purposes", etc.
+	Please buy the LD/VHS/Betamax/DVD/Blu-Ray!
+	
 ]]--
 
 
@@ -135,13 +139,13 @@ ROOMS = {
 		EXITS       = "MCQ@", 
 		NAME        = "A MAINTENANCE ROOM", 
 		DESCRIPTION = "THERE ARE DOORS TO THE NORTH AND SOUTH. THE NORTHERN DOOR IS OPEN. YOU CAN HEAR THE ROLLER COASTER.",
-		VIDEO       = "FR14038SE/FR14100PL/"
+		VIDEO       = "FR14038SE/FR14178PL/" --"FR14038SE/FR14100PL/"
 	}, { 
 		-- H 8
 		EXITS       = "D@N@", 
 		NAME        = "THE BELLY DANCER'S TENT", 
 		DESCRIPTION = "SHE STOPS AND LOOKS AT YOU.",
-		VIDEO       = "FR11818SE/FR11907PL/"
+		VIDEO       = "FR11818SE/FR11926PL/" --"FR11818SE/FR11907PL/"
 	}, { 
 		-- I 9
 		EXITS       = "@@M@", 
@@ -171,7 +175,7 @@ ROOMS = {
 		EXITS       = "I@G@", 
 		NAME        = "A CRAWLWAY", 
 		DESCRIPTION = "THE PASSAGE LEADS NORTH TO THE TOP OF THE ROLLER COASTER. THE NOISE IS QUITE LOUD.",
-		VIDEO       = "FR14724SE/FR14855PL/"
+		VIDEO       = "FR14724SE/FR14890PL/" --"FR14724SE/FR14855PL/"
 	}, { 
 		-- N 14
 		EXITS       = "@@@R", 
@@ -298,7 +302,7 @@ function onOverlayUpdate()
 	end
 
 	if END_FRAME ~= -1 then
-		--debugPrint("Frame " .. discGetFrame() .. " Waiting " .. END_FRAME)
+		debugPrint("Frame " .. discGetFrame() .. " Waiting " .. END_FRAME)
 		if (discGetFrame() >= END_FRAME) then
 			--debugPrint("Playback end.  Switching to state " .. NEXT_STATE)
 			discSearch(END_FRAME)
@@ -615,14 +619,16 @@ STATES = {
 		screenPrint("YOU HAVE JUST RECEIVED AN ANONYMOUS")
 		screenPrint("TIP THAT A BOMB HAS BEEN PLANTED")
 		screenPrint("ON A ROLLER COASTER.")
-		pioneer(STATE_BOMB_PLANTED, "FR6726SE/FR6959PL/")
+		--pioneer(STATE_BOMB_PLANTED, "FR6726SE/FR6959PL/")
+		pioneer(STATE_BOMB_PLANTED, "FR6726SE/FR7022PL/")
 	end,
 	
 	[STATE_BOMB_PLANTED] = function(what)
 		screenPrint("")
 		screenPrint("YOU ARE CALLED TO INVESTIGATE AND FLY")
 		screenPrint("OFF TO STOP THE SABOTEUR.")
-		pioneer(STATE_PLANE_ARRIVED, "FR30032SE/FR30214PL/")
+		--pioneer(STATE_PLANE_ARRIVED, "FR30032SE/FR30214PL/")
+		pioneer(STATE_PLANE_ARRIVED, "FR30032SE/FR30258PL/")
  	end,
 	
  	[STATE_PLANE_ARRIVED] = function(what)
@@ -774,7 +780,8 @@ STATES = {
 					screenPrint("YOU ARE SERVED A DELICIOUS MEAL")
 					screenPrint("UNFORTUNATELY, THE SERVICE IS")
 					screenPrint("RATHER SLOW.")
-					pioneer(STATE_BOOM, "FR19453SE/FR19799PL/")
+					--pioneer(STATE_BOOM, "FR19453SE/FR19799PL/")
+					pioneer(STATE_BOOM, "FR19453SE/FR19884PL/")
 				else
 					screenPrint("PLEASE ANSWER YES OR NO.")
 					NEXT_STATE  = STATE_ROOM_5
@@ -829,7 +836,8 @@ STATES = {
 	[STATE_ROOM_9] = function(what)
 		screenPrint("IF YOU LOOK BACK, YOU'LL NOTICE")
 		screenPrint("A CAR SPEEDING TOWARD YOU.")
-		pioneer(STATE_PLAY_AGAIN, "FR16185SE/FR16223PL/")
+		--pioneer(STATE_PLAY_AGAIN, "FR16185SE/FR16223PL/")
+		pioneer(STATE_PLAY_AGAIN, "FR16185SE/FR16239PL/")
  	end,
 	
 	[STATE_ROOM_15] = function(what)
@@ -871,7 +879,8 @@ STATES = {
 		if L == 2 and (what == "BREAK BOX" or what == "PUSH BUTTON" or what == "PRESS BUTTON" or what == "TURN KNOB" or what == "TURN DIAL") then
 			KW = 1
 			screenPrint("UH OH, I THINK THAT WAS A MISTAKE.")
-			pioneer(STATE_BREAK_BOX, "FR18722SE/FR18807PL/") 
+			--pioneer(STATE_BREAK_BOX, "FR18722SE/FR18807PL/") 
+			pioneer(STATE_BREAK_BOX, "FR18722SE/FR18827PL/")
 		end
 		
 		if what == "BREAK DOOR" then
@@ -952,7 +961,8 @@ STATES = {
 				screenPrint("YOU HAND OVER THE COINS AND PICK")
 				screenPrint("UP THE GUN.")
 				OBJECTS[1].LOCATION = -1
-				pioneer(STATE_WON_BEAR, "FR10960SE/FR11107PL/")
+				--pioneer(STATE_WON_BEAR, "FR10960SE/FR11107PL/")
+				pioneer(STATE_WON_BEAR, "FR10960SE/FR11146PL/")
 				--debugPrint("Asked for state " .. STATE_WON_BEAR)
 			end
 		end
@@ -1007,7 +1017,8 @@ STATES = {
 					if B == 0 then
 						screenPrint("IT DOESN'T WORK, MAYBE IT NEEDS BATTERIES?") 
 					else
-						pioneer(STATE_WON_GAME, "FR12169SE/FR12227PL/")
+						--pioneer(STATE_WON_GAME, "FR12169SE/FR12227PL/")
+						pioneer(STATE_WON_GAME, "FR12169SE/FR12240PL/")
 					end
 				end
 			end
@@ -1165,7 +1176,8 @@ STATES = {
 		T = T + 1
 		if T > 150 then
 			screenPrint("I THINK TIME JUST RAN OUT.")
-			pioneer(STATE_PLAY_AGAIN, "FR19801SE/FR20007PL/")
+			--pioneer(STATE_PLAY_AGAIN, "FR19801SE/FR20007PL/")
+			pioneer(STATE_PLAY_AGAIN, "FR19885SE/FR20109PL/")
 		end
 
 		-- Make sure we keep parsing.
diff --git a/Video/framefile.txt b/Video/framefile.txt
index a9b1bf6..c544209 100644
--- a/Video/framefile.txt
+++ b/Video/framefile.txt
@@ -9,5 +9,5 @@
 16185 16185_16223.mp4
 18722 18722_18807.mp4
 19453 19453_19799.mp4
-19801 19801_20007.mp4
+19885 19801_20007.mp4
 30032 30032_30214.mp4