diff --git a/assets/hdri/base_env.tres b/assets/hdri/base_env.tres
new file mode 100644
index 0000000..d040c81
--- /dev/null
+++ b/assets/hdri/base_env.tres
@@ -0,0 +1,10 @@
+[gd_resource type="Environment" load_steps=3 format=2]
+
+[ext_resource path="res://assets/hdri/tx_night_place.hdr" type="Texture" id=1]
+
+[sub_resource type="PanoramaSky" id=1]
+panorama = ExtResource( 1 )
+
+[resource]
+background_mode = 3
+background_sky = SubResource( 1 )
diff --git a/developers/aurelien/CheckLightmap.exr b/developers/aurelien/CheckLightmap.exr
index a4029ed..1bdc07f 100644
Binary files a/developers/aurelien/CheckLightmap.exr and b/developers/aurelien/CheckLightmap.exr differ
diff --git a/developers/aurelien/CheckLightmap.lmbake b/developers/aurelien/CheckLightmap.lmbake
index 028546a..b0d7ed3 100644
Binary files a/developers/aurelien/CheckLightmap.lmbake and b/developers/aurelien/CheckLightmap.lmbake differ
diff --git a/developers/aurelien/CheckLightmap.tscn b/developers/aurelien/CheckLightmap.tscn
index 9381af0..e0657c4 100644
--- a/developers/aurelien/CheckLightmap.tscn
+++ b/developers/aurelien/CheckLightmap.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=14 format=2]
 
 [ext_resource path="res://assets/props/book/sm_book.mesh" type="ArrayMesh" id=1]
 [ext_resource path="res://developers/aurelien/CheckLightmap.lmbake" type="BakedLightmapData" id=2]
@@ -6,9 +6,12 @@
 [ext_resource path="res://assets/props/misc/plane.mesh" type="ArrayMesh" id=4]
 [ext_resource path="res://assets/props/candle/sm_candlestick.mesh" type="ArrayMesh" id=5]
 [ext_resource path="res://assets/materials/gray.tres" type="Material" id=6]
-[ext_resource path="res://assets/props/dagger/materials/MA_Dissolve.material" type="Material" id=7]
-[ext_resource path="res://assets/props/book/materials/MAT_book.material" type="Material" id=8]
+[ext_resource path="res://assets/props/candle/sm_candle_b.mesh" type="ArrayMesh" id=7]
+[ext_resource path="res://assets/props/candle/sm_candle_c.mesh" type="ArrayMesh" id=8]
 [ext_resource path="res://assets/props/candle/sm_candle_a.mesh" type="ArrayMesh" id=9]
+[ext_resource path="res://assets/hdri/base_env.tres" type="Environment" id=10]
+[ext_resource path="res://assets/props/candle/sm_candle_d.mesh" type="ArrayMesh" id=11]
+[ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=12]
 
 [sub_resource type="ArrayMesh" id=1]
 
@@ -18,30 +21,13 @@ script = ExtResource( 3 )
 [node name="BakedLightmap" type="BakedLightmap" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.01067, 1.3203, -0.22506 )
 extents = Vector3( 2.04435, 1.56454, 3.03432 )
-quality = 3
-bounces = 6
-default_texels_per_unit = 4.0
 environment_mode = 1
 environment_min_light = Color( 0.12549, 0.12549, 0.286275, 1 )
 capture_quality = 2
 light_data = ExtResource( 2 )
 
-[node name="SpotLight" type="SpotLight" parent="."]
-transform = Transform( 1, 0, 0, 0, 0.145807, 0.989313, 0, -0.989313, 0.145807, 0.479118, 2.12757, 0.558079 )
-light_energy = 10.0
-light_indirect_energy = 4.0
-light_bake_mode = 2
-shadow_enabled = true
-spot_angle = 32.1
-
-[node name="SpotLight2" type="SpotLight" parent="."]
-transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.055364, 0.959701, -0.401885 )
-light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
-light_energy = 10.0
-light_indirect_energy = 4.0
-light_bake_mode = 2
-shadow_enabled = true
-spot_angle = 15.0
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = ExtResource( 10 )
 
 [node name="MeshInstance" type="MeshInstance" parent="."]
 use_in_baked_light = true
@@ -50,51 +36,100 @@ mesh = SubResource( 1 )
 [node name="Camera" type="Camera" parent="."]
 transform = Transform( 0.089016, -0.715663, 0.692751, 0, 0.695512, 0.718515, -0.99603, -0.0639593, 0.0619116, 2.07081, 2.13639, 0.731596 )
 
-[node name="sm_candlestick" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0622943, -0.000247162, -0.869008 )
-use_in_baked_light = true
-lightmap_scale = 1
-mesh = ExtResource( 5 )
-material/0 = null
-
 [node name="plane" type="MeshInstance" parent="."]
-transform = Transform( 5.179, 0, 0, 0, 1, 0, 0, 0, 8.204, -0.583, 0, 0 )
+transform = Transform( 5.179, 0, 0, 0, 1, 0, 0, 0, 11.9516, -0.00188392, 0, -1.52487 )
 use_in_baked_light = true
-lightmap_scale = 2
 mesh = ExtResource( 4 )
 material/0 = ExtResource( 6 )
 
-[node name="sm_candle_a" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.460123, 0.0295914, 0.0291587 )
-use_in_baked_light = true
-mesh = ExtResource( 9 )
-material/0 = null
+[node name="Lighting" type="Spatial" parent="."]
 
-[node name="sm_candle_a2" type="MeshInstance" parent="."]
-transform = Transform( 3, 0, 0, 0, 3, 0, 0, 0, 3, 0.291979, 0.0295914, 0.0291587 )
-use_in_baked_light = true
-lightmap_scale = 2
-mesh = ExtResource( 9 )
-material/0 = null
+[node name="SpotLight2" type="SpotLight" parent="Lighting"]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, 0.479468 )
+light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
+light_energy = 10.0
+light_indirect_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_angle = 15.0
 
-[node name="sm_book3" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.381911, 0.0414187, 1.03881 )
-use_in_baked_light = true
-lightmap_scale = 1
-mesh = ExtResource( 1 )
-material/0 = null
+[node name="SpotLight5" type="SpotLight" parent="Lighting"]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -0.597942 )
+light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
+light_energy = 10.0
+light_indirect_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_angle = 15.0
 
-[node name="sm_book10" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.381911, 0.0414187, 0.331732 )
-use_in_baked_light = true
-mesh = ExtResource( 1 )
-material/0 = ExtResource( 7 )
+[node name="SpotLight4" type="SpotLight" parent="Lighting"]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -0.234948 )
+light_energy = 10.0
+light_indirect_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_angle = 15.0
 
-[node name="sm_book9" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.381911, 0.0414187, 1.53911 )
-use_in_baked_light = true
-mesh = ExtResource( 1 )
-material/0 = null
+[node name="SpotLight3" type="SpotLight" parent="Lighting"]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, 0.149649 )
+light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
+light_energy = 10.0
+light_indirect_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_angle = 15.0
+
+[node name="SpotLight6" type="SpotLight" parent="Lighting"]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -1.7265 )
+light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
+light_energy = 10.0
+light_indirect_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_angle = 15.0
+
+[node name="SpotLight7" type="SpotLight" parent="Lighting"]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -1.36351 )
+light_energy = 10.0
+light_indirect_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_angle = 15.0
+
+[node name="SpotLight8" type="SpotLight" parent="Lighting"]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -0.978908 )
+light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
+light_energy = 10.0
+light_indirect_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_angle = 15.0
+
+[node name="SpotLight9" type="SpotLight" parent="Lighting"]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -2.81604 )
+light_color = Color( 0.564706, 0.227451, 0.227451, 1 )
+light_energy = 10.0
+light_indirect_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_angle = 15.0
+
+[node name="SpotLight10" type="SpotLight" parent="Lighting"]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -2.45304 )
+light_energy = 10.0
+light_indirect_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_angle = 15.0
+
+[node name="SpotLight11" type="SpotLight" parent="Lighting"]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.41082, 0.959701, -2.06845 )
+light_color = Color( 0.227451, 0.564706, 0.262745, 1 )
+light_energy = 10.0
+light_indirect_energy = 4.0
+light_bake_mode = 2
+shadow_enabled = true
+spot_angle = 15.0
 
 [node name="Books" type="Spatial" parent="."]
 
@@ -102,38 +137,38 @@ material/0 = null
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.743055, 0.0414186, 1.03485 )
 use_in_baked_light = true
 mesh = ExtResource( 1 )
-material/0 = ExtResource( 8 )
+material/0 = null
 
 [node name="sm_book5" type="MeshInstance" parent="Books"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0423009, 0.0414186, 1.05613 )
 use_in_baked_light = true
 lightmap_scale = 3
 mesh = ExtResource( 1 )
-material/0 = ExtResource( 8 )
+material/0 = null
 
 [node name="sm_book11" type="MeshInstance" parent="Books"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0423009, 0.0414186, 1.52165 )
 use_in_baked_light = true
 mesh = ExtResource( 1 )
-material/0 = ExtResource( 8 )
+material/0 = null
 
 [node name="sm_book6" type="MeshInstance" parent="Books"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.293967, 0.0414186, 1.03485 )
 use_in_baked_light = true
 mesh = ExtResource( 1 )
-material/0 = ExtResource( 8 )
+material/0 = null
 
 [node name="sm_book7" type="MeshInstance" parent="Books"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.743055, 0.0414186, 1.51383 )
 use_in_baked_light = true
 mesh = ExtResource( 1 )
-material/0 = ExtResource( 8 )
+material/0 = null
 
 [node name="sm_book8" type="MeshInstance" parent="Books"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.293967, 0.0414186, 1.51383 )
 use_in_baked_light = true
 mesh = ExtResource( 1 )
-material/0 = ExtResource( 8 )
+material/0 = null
 
 [node name="sm_book" type="MeshInstance" parent="Books"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0435888, 0.106022 )
@@ -143,8 +178,103 @@ mesh = ExtResource( 1 )
 material/0 = null
 
 [node name="sm_book2" type="MeshInstance" parent="Books"]
-transform = Transform( 0.276862, 0, 0.96091, 0, 1, 0, -0.96091, 0, 0.276862, 0.186131, 0.0414188, -0.458372 )
+transform = Transform( 0.276862, 0, 0.96091, 0, 1, 0, -0.96091, 0, 0.276862, -0.104465, 0.0414188, 0.547756 )
 use_in_baked_light = true
 lightmap_scale = 1
 mesh = ExtResource( 1 )
 material/0 = null
+
+[node name="sm_book3" type="MeshInstance" parent="Books"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.381911, 0.0414187, 1.03881 )
+use_in_baked_light = true
+lightmap_scale = 1
+mesh = ExtResource( 1 )
+material/0 = null
+
+[node name="sm_book10" type="MeshInstance" parent="Books"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.381911, 0.0414187, 0.331732 )
+use_in_baked_light = true
+mesh = ExtResource( 1 )
+material/0 = null
+
+[node name="sm_book9" type="MeshInstance" parent="Books"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.381911, 0.0414187, 1.53911 )
+use_in_baked_light = true
+mesh = ExtResource( 1 )
+material/0 = null
+
+[node name="Candle" type="Spatial" parent="."]
+
+[node name="sm_candlestick" type="MeshInstance" parent="Candle"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.26949, -0.000247162, -0.190021 )
+use_in_baked_light = true
+lightmap_scale = 1
+mesh = ExtResource( 5 )
+material/0 = null
+
+[node name="sm_candlestick2" type="MeshInstance" parent="Candle"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.477435, -0.000247162, -0.190021 )
+use_in_baked_light = true
+lightmap_scale = 1
+mesh = ExtResource( 5 )
+material/0 = null
+
+[node name="sm_candle_a" type="MeshInstance" parent="Candle"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.460123, 0.0295914, 0.0291587 )
+use_in_baked_light = true
+mesh = ExtResource( 9 )
+material/0 = null
+
+[node name="sm_candle_a2" type="MeshInstance" parent="Candle"]
+transform = Transform( 3, 0, 0, 0, 3, 0, 0, 0, 3, 0.291979, 0.0295914, 0.0291587 )
+use_in_baked_light = true
+mesh = ExtResource( 9 )
+material/0 = null
+
+[node name="sm_candle_b" type="MeshInstance" parent="Candle"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.469327, 0.0330793, -0.387681 )
+use_in_baked_light = true
+mesh = ExtResource( 7 )
+material/0 = null
+
+[node name="sm_candle_b2" type="MeshInstance" parent="Candle"]
+transform = Transform( 1.83922, 0, 0, 0, 1.83922, 0, 0, 0, 1.83922, 0.271941, 0.0630442, -0.414322 )
+use_in_baked_light = true
+mesh = ExtResource( 7 )
+material/0 = null
+
+[node name="sm_candle_d" type="MeshInstance" parent="Candle"]
+transform = Transform( 2.21301, 0, 0, 0, 2.21301, 0, 0, 0, 2.21301, 0.470213, 0.0446767, -0.844206 )
+use_in_baked_light = true
+mesh = ExtResource( 11 )
+material/0 = null
+
+[node name="sm_candle_d2" type="MeshInstance" parent="Candle"]
+transform = Transform( 3.61366, 0, 0, 0, 3.61366, 0, 0, 0, 3.61366, 0.201699, 0.121002, -0.844206 )
+use_in_baked_light = true
+mesh = ExtResource( 11 )
+material/0 = null
+
+[node name="sm_candle_c" type="MeshInstance" parent="Candle"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.473356, 0.0278057, -0.559005 )
+use_in_baked_light = true
+mesh = ExtResource( 8 )
+material/0 = null
+
+[node name="sm_candle_c2" type="MeshInstance" parent="Candle"]
+transform = Transform( 2.21301, 0, 0, 0, 2.21301, 0, 0, 0, 2.21301, 0.283916, 0.0534962, -0.597519 )
+use_in_baked_light = true
+mesh = ExtResource( 8 )
+material/0 = null
+
+[node name="sm_candle_top" type="MeshInstance" parent="Candle"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.502775, 0.0267428, -1.04497 )
+use_in_baked_light = true
+mesh = ExtResource( 12 )
+material/0 = null
+
+[node name="sm_candle_top2" type="MeshInstance" parent="Candle"]
+transform = Transform( 3.02964, 0, 0, 0, 3.02964, 0, 0, 0, 3.02964, 0.323108, 0.0842445, -1.08129 )
+use_in_baked_light = true
+mesh = ExtResource( 12 )
+material/0 = null