diff --git a/Amanda/furni/tent/barrel.blend.import b/Amanda/furni/tent/barrel.blend.import
index 784bbc2..fb5bee3 100644
--- a/Amanda/furni/tent/barrel.blend.import
+++ b/Amanda/furni/tent/barrel.blend.import
@@ -4,12 +4,11 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://ddnwvcwa6drqi"
-path="res://.godot/imported/barrel.blend-d55ef0f77e7a5f2e77ecca4be941021a.scn"
+valid=false
 
 [deps]
 
 source_file="res://Amanda/furni/tent/barrel.blend"
-dest_files=["res://.godot/imported/barrel.blend-d55ef0f77e7a5f2e77ecca4be941021a.scn"]
 
 [params]
 
diff --git a/Amanda/furni/tent/tent.blend.import b/Amanda/furni/tent/tent.blend.import
index f771f9b..b5976e4 100644
--- a/Amanda/furni/tent/tent.blend.import
+++ b/Amanda/furni/tent/tent.blend.import
@@ -4,12 +4,11 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://ptwannnym6kc"
-path="res://.godot/imported/tent.blend-c2e4a2ad0442aa1c9be7f4044876a350.scn"
+valid=false
 
 [deps]
 
 source_file="res://Amanda/furni/tent/tent.blend"
-dest_files=["res://.godot/imported/tent.blend-c2e4a2ad0442aa1c9be7f4044876a350.scn"]
 
 [params]
 
diff --git a/Florian/Entity/People/merchant_tent3.blend.import b/Florian/Entity/People/merchant_tent3.blend.import
index b55dad2..bf9ac5b 100644
--- a/Florian/Entity/People/merchant_tent3.blend.import
+++ b/Florian/Entity/People/merchant_tent3.blend.import
@@ -4,12 +4,11 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://bywn575nv8tm8"
-path="res://.godot/imported/merchant_tent3.blend-6089b79591e5b9fc9fb6643f66087c87.scn"
+valid=false
 
 [deps]
 
 source_file="res://Florian/Entity/People/merchant_tent3.blend"
-dest_files=["res://.godot/imported/merchant_tent3.blend-6089b79591e5b9fc9fb6643f66087c87.scn"]
 
 [params]
 
diff --git a/Nikita/3d_popup.tscn b/Nikita/3d_popup.tscn
index 4a58502..d1848f2 100644
--- a/Nikita/3d_popup.tscn
+++ b/Nikita/3d_popup.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=3 uid="uid://bab0m4cvoiouv"]
 
-[ext_resource type="PackedScene" uid="uid://cbva1dnqoaopn" path="res://Nikita/level_popup.tscn" id="1_0h1bi"]
-[ext_resource type="Script" uid="uid://1dr3112amj64" path="res://Nikita/3d_popup.gd" id="1_utlwn"]
+[ext_resource type="PackedScene" uid="uid://oxtnk076gboh" path="res://Nikita/level_popup.tscn" id="1_0h1bi"]
+[ext_resource type="Script" uid="uid://1dr3112amj64" path="res://Nikita/scripts/3d_popup.gd" id="1_utlwn"]
 
 [sub_resource type="QuadMesh" id="QuadMesh_utlwn"]
 size = Vector2(0.6, 0.4)
diff --git a/Nikita/earth.tscn b/Nikita/earth.tscn
index de88b1a..0457eab 100644
--- a/Nikita/earth.tscn
+++ b/Nikita/earth.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=8 format=3 uid="uid://cjlojmoyhw2cp"]
+[gd_scene load_steps=9 format=3 uid="uid://cjlojmoyhw2cp"]
 
 [ext_resource type="PackedScene" uid="uid://7fijqcjxggit" path="res://Nikita/source/Earth_Final.fbx" id="1_mnd7v"]
 [ext_resource type="Texture2D" uid="uid://cw4gkryn2sl7y" path="res://Nikita/textures/Earth2_Water_BaseColor.png" id="2_v2ft5"]
 [ext_resource type="Texture2D" uid="uid://da0uksbt2mkqw" path="res://Nikita/textures/Earth2_Land_BaseColor.png" id="3_drefq"]
 [ext_resource type="PackedScene" uid="uid://ccjwh4alvryho" path="res://Nikita/waypoint.tscn" id="4_drefq"]
+[ext_resource type="PackedScene" uid="uid://by5cq6m32hbor" path="res://Florian/Map/Oktoberfest.tscn" id="5_tyl1s"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tyl1s"]
 albedo_texture = ExtResource("2_v2ft5")
@@ -12,6 +13,7 @@ albedo_texture = ExtResource("2_v2ft5")
 albedo_texture = ExtResource("3_drefq")
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_drefq"]
+radius = 0.39191
 
 [node name="Earth_Final" instance=ExtResource("1_mnd7v")]
 
@@ -26,5 +28,15 @@ transform = Transform3D(0.17, 0, 0, 0, 0.17, 0, 0, 0, 0.17, 0, 0, 0)
 shape = SubResource("SphereShape3D_drefq")
 disabled = true
 
-[node name="WaypointTest" parent="." index="1" instance=ExtResource("4_drefq")]
-transform = Transform3D(0.01, 0, 0, 0, 0.01, 0, 0, 0, 0.01, 0.00702367, 0.0636012, 0.0580069)
+[node name="WaypointOkt" parent="." index="1" instance=ExtResource("4_drefq")]
+transform = Transform3D(-0.01, 0, -8.74228e-10, 0, 0.01, 0, 8.74228e-10, 0, -0.01, 0.00702367, 0.0636012, 0.0580069)
+scene_name = "Oktoberfest"
+scene_description = "- help to light up the festival
+- find the lost beer"
+switch_to = ExtResource("5_tyl1s")
+
+[node name="WaypointChi" parent="." index="2" instance=ExtResource("4_drefq")]
+transform = Transform3D(-4.37114e-10, 0, -0.01, 0, 0.01, 0, 0.01, 0, -4.37114e-10, 0.0740627, 0.0439419, 0)
+
+[node name="WaypointBal" parent="." index="3" instance=ExtResource("4_drefq")]
+transform = Transform3D(-4.37114e-10, 0, 0.01, 0, 0.01, 0, -0.01, 0, -4.37114e-10, -0.0725918, 0.0486524, -0.0129466)
diff --git a/Nikita/hub_scene.tscn b/Nikita/hub_scene.tscn
index 5dd865a..63405de 100644
--- a/Nikita/hub_scene.tscn
+++ b/Nikita/hub_scene.tscn
@@ -26,4 +26,4 @@ transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0)
 transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0)
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
-transform = Transform3D(0.0337074, -0.226039, 0.973535, 0.00782163, 0.974118, 0.225904, -0.999401, 0, 0.034603, 15.6131, 3.61956, 0)
+transform = Transform3D(-0.0327197, -0.325403, -0.945009, 0.0112599, -0.945575, 0.325209, -0.999401, 1.5123e-09, 0.034603, -30.3869, 3.61956, 0)
diff --git a/Nikita/level_popup.tscn b/Nikita/level_popup.tscn
index 9756fcc..5168fb1 100644
--- a/Nikita/level_popup.tscn
+++ b/Nikita/level_popup.tscn
@@ -1,6 +1,6 @@
-[gd_scene load_steps=4 format=3 uid="uid://cbva1dnqoaopn"]
+[gd_scene load_steps=4 format=3 uid="uid://oxtnk076gboh"]
 
-[ext_resource type="Script" uid="uid://c1rdbsbip2wvj" path="res://Nikita/scripts/level_popup.gd" id="1_3awpt"]
+[ext_resource type="Script" uid="uid://d1duimhkemcax" path="res://Nikita/scripts/level_popup.gd" id="1_3awpt"]
 [ext_resource type="Texture2D" uid="uid://otyci5h617qa" path="res://Nikita/source/playbutton.png" id="1_ay7gq"]
 [ext_resource type="Texture2D" uid="uid://hk701pejgl" path="res://Nikita/textures/popup.png" id="1_pk11s"]
 
@@ -9,8 +9,9 @@ script = ExtResource("1_3awpt")
 
 [node name="Name" type="Label" parent="."]
 offset_left = 50.0
+offset_top = 6.0
 offset_right = 550.0
-offset_bottom = 70.0
+offset_bottom = 76.0
 theme_override_font_sizes/font_size = 48
 text = "Place name"
 horizontal_alignment = 1
@@ -18,9 +19,9 @@ vertical_alignment = 1
 
 [node name="Description" type="Label" parent="."]
 offset_left = 50.0
-offset_top = 70.0
+offset_top = 89.0
 offset_right = 550.0
-offset_bottom = 270.0
+offset_bottom = 289.0
 theme_override_font_sizes/font_size = 24
 text = "Objective:
 "
@@ -30,6 +31,7 @@ offset_left = 200.0
 offset_top = 300.0
 offset_right = 400.0
 offset_bottom = 350.0
+toggle_mode = true
 icon = ExtResource("1_ay7gq")
 flat = true
 
diff --git a/Nikita/3d_popup.gd b/Nikita/scripts/3d_popup.gd
similarity index 99%
rename from Nikita/3d_popup.gd
rename to Nikita/scripts/3d_popup.gd
index 0086d41..216f376 100644
--- a/Nikita/3d_popup.gd
+++ b/Nikita/scripts/3d_popup.gd
@@ -13,13 +13,11 @@ var last_event_time := -1.0
 @onready var node_quad: MeshInstance3D = $Quad
 @onready var node_area: Area3D = $Quad/Area3D
 
-#var original_scale
-
 func _ready() -> void:
 	node_area.mouse_entered.connect(_mouse_entered_area)
 	node_area.mouse_exited.connect(_mouse_exited_area)
 	node_area.input_event.connect(_mouse_input_event)
-	#original_scale = $Quad.scale
+	
 	# If the material is NOT set to use billboard settings, then avoid running billboard specific code
 	#if node_quad.get_surface_override_material(0).billboard_mode == BaseMaterial3D.BillboardMode.BILLBOARD_DISABLED:
 		#set_process(false)
diff --git a/Nikita/3d_popup.gd.uid b/Nikita/scripts/3d_popup.gd.uid
similarity index 100%
rename from Nikita/3d_popup.gd.uid
rename to Nikita/scripts/3d_popup.gd.uid
diff --git a/Nikita/scripts/level_popup.gd b/Nikita/scripts/level_popup.gd
index 0e12ed6..89368ba 100644
--- a/Nikita/scripts/level_popup.gd
+++ b/Nikita/scripts/level_popup.gd
@@ -1,5 +1,6 @@
 extends Node2D
 
+signal enter_level
 
 func _on_play_button_pressed() -> void:
-	print("2D Button pressed!")
+	emit_signal("enter_level")
diff --git a/Nikita/scripts/level_popup.gd.uid b/Nikita/scripts/level_popup.gd.uid
index 5345197..25f21ff 100644
--- a/Nikita/scripts/level_popup.gd.uid
+++ b/Nikita/scripts/level_popup.gd.uid
@@ -1 +1 @@
-uid://c1rdbsbip2wvj
+uid://d1duimhkemcax
diff --git a/Nikita/scripts/scene_loader.gd b/Nikita/scripts/scene_loader.gd
new file mode 100644
index 0000000..3251849
--- /dev/null
+++ b/Nikita/scripts/scene_loader.gd
@@ -0,0 +1,3 @@
+extends Node
+
+signal enter_level
diff --git a/Nikita/scripts/scene_loader.gd.uid b/Nikita/scripts/scene_loader.gd.uid
new file mode 100644
index 0000000..4f3280c
--- /dev/null
+++ b/Nikita/scripts/scene_loader.gd.uid
@@ -0,0 +1 @@
+uid://dlk7wj2j31u10
diff --git a/Nikita/scripts/waypoint.gd b/Nikita/scripts/waypoint.gd
index c7cd1e0..3183607 100644
--- a/Nikita/scripts/waypoint.gd
+++ b/Nikita/scripts/waypoint.gd
@@ -1,5 +1,9 @@
 extends Node3D
 
+@export var scene_name : String
+@export_multiline var scene_description : String
+@export var switch_to : PackedScene
+
 var to_earth
 var toggle_popup : bool = false
 
@@ -8,7 +12,11 @@ func _ready() -> void:
 	var cam = get_viewport().get_camera_3d()
 	to_earth = (get_parent().global_position - global_position).normalized()
 	look_at(cam.global_position, Vector3.UP)
-
+	$Popup/SubViewport/LevelPopup/Name.text = scene_name
+	$Popup/SubViewport/LevelPopup/Description.text = scene_description
+	var child = $Popup/SubViewport/LevelPopup
+	child.enter_level.connect(_on_play_button_pressed)
+	
 func _process(delta):
 	var cam = get_viewport().get_camera_3d()
 	var to_camera = (cam.global_position - global_position).normalized()
@@ -58,3 +66,6 @@ func _on_area_3d_input_event(camera: Node, event: InputEvent, event_position: Ve
 	if event is InputEventMouseButton and event.is_released() and event.button_index == MOUSE_BUTTON_LEFT:
 		toggle_popup = !toggle_popup
 		get_node("Popup").visible = toggle_popup
+
+func _on_play_button_pressed() -> void:
+	get_tree().change_scene_to_packed(switch_to)
diff --git a/Nikita/sub_viewport_container.gd b/Nikita/sub_viewport_container.gd
deleted file mode 100644
index 012a5ba..0000000
--- a/Nikita/sub_viewport_container.gd
+++ /dev/null
@@ -1,4 +0,0 @@
-extends SubViewportContainer
-
-func _ready() -> void:
-	$SubViewport.size = get_viewport().size
diff --git a/Nikita/sub_viewport_container.gd.uid b/Nikita/sub_viewport_container.gd.uid
deleted file mode 100644
index 0ed28d7..0000000
--- a/Nikita/sub_viewport_container.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://b2nb1jajwuv65
diff --git a/Nikita/waypoint.tscn b/Nikita/waypoint.tscn
index 98e5e9e..0a3c597 100644
--- a/Nikita/waypoint.tscn
+++ b/Nikita/waypoint.tscn
@@ -35,6 +35,6 @@ billboard = 1
 texture = ExtResource("2_iiqp4")
 
 [node name="Popup" parent="." instance=ExtResource("4_3sm4y")]
-transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -4.28591, 0.944037, 2.87264e-07)
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -4.28591, 1.46584, -1.00785)
 
 [connection signal="input_event" from="MeshInstance3D/Area3D" to="." method="_on_area_3d_input_event"]
diff --git a/project.godot b/project.godot
index acd7ec2..03c73e7 100644
--- a/project.godot
+++ b/project.godot
@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="AllAroundTheWorld"
-run/main_scene="uid://by5cq6m32hbor"
+run/main_scene="uid://b6kb866y3e4aa"
 config/features=PackedStringArray("4.4", "Forward Plus")
 config/icon="res://icon.svg"
 
@@ -57,3 +57,7 @@ interact={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
 ]
 }
+
+[rendering]
+
+renderer/rendering_method="gl_compatibility"