diff --git a/podbooker/BookingScreen.gd b/podbooker/BookingScreen.gd
index a4afc9d..a6620d7 100644
--- a/podbooker/BookingScreen.gd
+++ b/podbooker/BookingScreen.gd
@@ -76,3 +76,15 @@ func _on_ClearButton_pressed():
 		_clear_form()
 		_book_it()
 		_on_CancelButton_pressed()
+
+
+func _on_change_button_pressed():
+	if $"%BookPw".text == "WhoIsJaap":
+			if name1.text == "" or reason.text =="":
+				err_label.visible = true
+			else:
+				var namer = "/root/MainStartScreen/ButtonGrid/" + important_vars.pod + "L" + str(important_vars.time)
+				var sp = get_node(str(namer))
+				sp.text = "BOOKED"
+				_book_it()
+				_on_CancelButton_pressed()
diff --git a/podbooker/ButtonScript.gd b/podbooker/ButtonScript.gd
index 70f9880..b3fc2bc 100644
--- a/podbooker/ButtonScript.gd
+++ b/podbooker/ButtonScript.gd
@@ -56,10 +56,10 @@ func set_booking_screen_values():
 	day_name.text = "Today is " + times.dayofweek_word
 	topbar_color()
 	booking_vars.read_values()
-	if name1.text != "":
-		book_button.text = "Save Changed Booking"
-	else:
-		book_button.text = "Book"
+#	if name1.text != "":
+#		book_button.text = "Save Changed Booking"
+#	else:
+#		book_button.text = "Book"
 
 
 func drop_names_to_two():
@@ -107,12 +107,16 @@ func book_button_pressed(pod_name, lesson):
 #	settings_button.visible = false
 	if name1.text != "":
 		clear_button.visible = true
+		$"%ChangeButton".visible = true
 		$"%ClearBookPw".visible = true
 		$"%BookPw".visible = true
+		$"%BookButton".visible = false
 	if name1.text == "":
 		clear_button.visible = false
+		$"%ChangeButton".visible = false
 		$"%ClearBookPw".visible = false
 		$"%BookPw".visible = false
+		$"%BookButton".visible = true
 
 func _on_A1L1_pressed():
 	book_button_pressed("A1", 1)
diff --git a/podbooker/MainStartScreen.tscn b/podbooker/MainStartScreen.tscn
index 042a3a8..38df775 100644
--- a/podbooker/MainStartScreen.tscn
+++ b/podbooker/MainStartScreen.tscn
@@ -1483,6 +1483,12 @@ layout_mode = 2
 size_flags_horizontal = 3
 text = "Book"
 
+[node name="ChangeButton" type="Button" parent="BookingScreen/Buttons"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Change Booking"
+
 [node name="ClearButton" type="Button" parent="BookingScreen/Buttons"]
 unique_name_in_owner = true
 layout_mode = 2
@@ -1500,7 +1506,7 @@ unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 theme_override_colors/font_color = Color(0, 0, 0, 1)
-text = "Clear Booking Password:"
+text = "Clear / Change Password:"
 
 [node name="BookPw" type="LineEdit" parent="BookingScreen/PwArea"]
 unique_name_in_owner = true
@@ -1724,6 +1730,7 @@ script = ExtResource("11")
 [connection signal="pressed" from="SettingsButton" to="." method="_on_SettingsButton_pressed"]
 [connection signal="pressed" from="BookingScreen/Buttons/CancelButton" to="BookingScreen" method="_on_CancelButton_pressed"]
 [connection signal="pressed" from="BookingScreen/Buttons/BookButton" to="BookingScreen" method="_on_BookButton_pressed"]
+[connection signal="pressed" from="BookingScreen/Buttons/ChangeButton" to="BookingScreen" method="_on_change_button_pressed"]
 [connection signal="pressed" from="BookingScreen/Buttons/ClearButton" to="BookingScreen" method="_on_ClearButton_pressed"]
 [connection signal="pressed" from="ResetMenu/ResetButton" to="ResetMenu" method="_on_ResetButton_pressed"]
 [connection signal="pressed" from="ResetMenu/CancelReset" to="ResetMenu" method="_on_CancelReset_pressed"]