diff --git a/ootw/ootw.dsk b/ootw/ootw.dsk
index cac73295..d1f4ea2b 100644
Binary files a/ootw/ootw.dsk and b/ootw/ootw.dsk differ
diff --git a/ootw/ootw_c2.s b/ootw/ootw_c2.s
index 835e2e9d..684e2934 100644
--- a/ootw/ootw_c2.s
+++ b/ootw/ootw_c2.s
@@ -40,7 +40,7 @@ ootw_c2:
 	; Run the intro
 	;=======================
 
-	jsr	ootw_c2_intro
+;	jsr	ootw_c2_intro
 
 	lda	#0
 	sta	CITY_MOVIE_SEEN
diff --git a/ootw/ootw_c2_elevator.s b/ootw/ootw_c2_elevator.s
index 206bf0d4..55690a27 100644
--- a/ootw/ootw_c2_elevator.s
+++ b/ootw/ootw_c2_elevator.s
@@ -242,10 +242,13 @@ elevator_frame_no_oflo:
 	;==========================
 
 	lda	PHYSICIST_X
-	cmp	#17
+	cmp	#16
 	bcc	not_on_elevator		; blt
+	cmp	#23
+	bcs	not_on_elevator		; bge
+
 	lda	#1
-	bne	update_elevator		; balways
+	bne	update_elevator		; bra
 
 not_on_elevator:
 	lda	#0