diff --git a/Content/Blueprints/OptiXGameModeBP.uasset b/Content/Blueprints/OptiXGameModeBP.uasset
index 54f2b67e692e124c6c821aec26b775a3571ebe77..9d3bff61140f07f2c52f9e2c50c8369c0a35960a 100644
Binary files a/Content/Blueprints/OptiXGameModeBP.uasset and b/Content/Blueprints/OptiXGameModeBP.uasset differ
diff --git a/Content/Blueprints/OptiXObjects/OptiXLaserActor_Pickup.uasset b/Content/Blueprints/OptiXObjects/OptiXLaserActor_Pickup.uasset
index 1091bad9d3e7829dadd11289da3789a3e111d4bd..12e540eef2fa3ceb787d12e1491618a67f2bad5b 100644
Binary files a/Content/Blueprints/OptiXObjects/OptiXLaserActor_Pickup.uasset and b/Content/Blueprints/OptiXObjects/OptiXLaserActor_Pickup.uasset differ
diff --git a/Content/Blueprints/OptiXObjects/OptiXLaserDetectorActor_Pickup.uasset b/Content/Blueprints/OptiXObjects/OptiXLaserDetectorActor_Pickup.uasset
index d8dce25d511b009feffbaa44f3d71dcedab7da25..a2d0660d67225d78b2702f67c5f202a894846d0c 100644
Binary files a/Content/Blueprints/OptiXObjects/OptiXLaserDetectorActor_Pickup.uasset and b/Content/Blueprints/OptiXObjects/OptiXLaserDetectorActor_Pickup.uasset differ
diff --git a/Content/Blueprints/OptiXObjects/SelectableTargetBP.uasset b/Content/Blueprints/OptiXObjects/SelectableTargetBP.uasset
index 34445617130c0dd58f7b9f12b295235c66fe2de8..ca8efd9f57d53b33eb388bb3380d7bd77a881a84 100644
Binary files a/Content/Blueprints/OptiXObjects/SelectableTargetBP.uasset and b/Content/Blueprints/OptiXObjects/SelectableTargetBP.uasset differ
diff --git a/Content/Blueprints/OptiXObjects/SelectableTargetBP_Black.uasset b/Content/Blueprints/OptiXObjects/SelectableTargetBP_Black.uasset
index db0631364bdd4392058272e6f832d696993eb426..245ee109dc3b1a1533dcdd5f95add0da2b550423 100644
Binary files a/Content/Blueprints/OptiXObjects/SelectableTargetBP_Black.uasset and b/Content/Blueprints/OptiXObjects/SelectableTargetBP_Black.uasset differ
diff --git a/Content/Blueprints/OptiXObjects/SelectableTargetBP_Circles.uasset b/Content/Blueprints/OptiXObjects/SelectableTargetBP_Circles.uasset
index dbca406026b8518f698a282c347f5883d3c13da9..899237562f89f3fa4a2cc89865401128ea6f2b13 100644
Binary files a/Content/Blueprints/OptiXObjects/SelectableTargetBP_Circles.uasset and b/Content/Blueprints/OptiXObjects/SelectableTargetBP_Circles.uasset differ
diff --git a/Content/Blueprints/OptiXObjects/SelectableTargetPB_Grid.uasset b/Content/Blueprints/OptiXObjects/SelectableTargetPB_Grid.uasset
index 72aa22c365cea20d9c0e8a45e6596ecc555c8d12..e96c064eabb076d54c6ea06525dfff815f4aec14 100644
Binary files a/Content/Blueprints/OptiXObjects/SelectableTargetPB_Grid.uasset and b/Content/Blueprints/OptiXObjects/SelectableTargetPB_Grid.uasset differ
diff --git a/Content/Blueprints/OptiXVRPawnStandaloneBP.uasset b/Content/Blueprints/OptiXVRPawnStandaloneBP.uasset
index 83f4e6217e3e596a2bc95a14856ecfe34fdafcfe..28b42d429448e4fdb1b05068f2922209080a6860 100644
Binary files a/Content/Blueprints/OptiXVRPawnStandaloneBP.uasset and b/Content/Blueprints/OptiXVRPawnStandaloneBP.uasset differ
diff --git a/Content/Blueprints/OpticalTable.uasset b/Content/Blueprints/OpticalTable.uasset
index 1348924fd87c5cce2e2385ce178d68be35020e67..e06b89d09ec376b8d987a4ccb60a5a4821d63d37 100644
Binary files a/Content/Blueprints/OpticalTable.uasset and b/Content/Blueprints/OpticalTable.uasset differ
diff --git a/Content/Blueprints/Screen_Blueprint.uasset b/Content/Blueprints/Screen_Blueprint.uasset
index 9466093bac18f14fd88a32adaf36509bb4841adb..11c260a7dbdc192a74ba44df0cf001ac98268663 100644
Binary files a/Content/Blueprints/Screen_Blueprint.uasset and b/Content/Blueprints/Screen_Blueprint.uasset differ
diff --git a/Content/Blueprints/SelectableActorBP.uasset b/Content/Blueprints/SelectableActorBP.uasset
index bf7a8c49fd902a609e8c63d879173d1acd41bef4..6b00d06444f545c931663189370d7108bcd20657 100644
Binary files a/Content/Blueprints/SelectableActorBP.uasset and b/Content/Blueprints/SelectableActorBP.uasset differ
diff --git a/Content/Targets/Screen.uasset b/Content/Targets/Screen.uasset
index bc27a4a03f36b6d474eeeea6de1dfa873d33a719..34920db546702a1300a9a9d7f3ed7810ef119a9c 100644
Binary files a/Content/Targets/Screen.uasset and b/Content/Targets/Screen.uasset differ
diff --git a/Content/UI/Tablet/ScenesWidgetTest.uasset b/Content/UI/Tablet/ScenesWidgetTest.uasset
index ebdd53debf600f53cc253c6dd8744ab13a4f3327..01c235d3c60b8043bd62ed76da28e4021a06e3a9 100644
Binary files a/Content/UI/Tablet/ScenesWidgetTest.uasset and b/Content/UI/Tablet/ScenesWidgetTest.uasset differ
diff --git a/Content/UI/Tablet/ScreenWidgetTabs.uasset b/Content/UI/Tablet/ScreenWidgetTabs.uasset
index 13df34fbb2a27998ba2cfd041d444343a46797d4..7bd49f4f004dab7a209131a57e759af91f77dde8 100644
Binary files a/Content/UI/Tablet/ScreenWidgetTabs.uasset and b/Content/UI/Tablet/ScreenWidgetTabs.uasset differ
diff --git a/Content/UI/Tablet/TileViewWidget.uasset b/Content/UI/Tablet/TileViewWidget.uasset
index 1b4a9fd6fd95af6610398a2c987f462fb0b7db11..4ff765a9d9f6db83b7acfa21705880e1196f0fc8 100644
Binary files a/Content/UI/Tablet/TileViewWidget.uasset and b/Content/UI/Tablet/TileViewWidget.uasset differ
diff --git a/Source/OptiX/Private/OptiXModule.cpp b/Source/OptiX/Private/OptiXModule.cpp
index 84c746a28f25c4c4b9e011b8bcd559bc7adafa25..7632bd4ecb4b82a96c7dcf816985bbbc9da2162a 100644
--- a/Source/OptiX/Private/OptiXModule.cpp
+++ b/Source/OptiX/Private/OptiXModule.cpp
@@ -146,6 +146,17 @@ void FOptiXModule::LoadSceneData()
 
 	TArray<FString> FoundFiles;
 
+
+
+	FSceneData EmptyScene;
+
+
+	EmptyScene.SceneName = "EmptyScene";
+	EmptyScene.LaserPosition = 0;
+	EmptyScene.Wavelength = 500;
+
+	SceneDataArray.Push(EmptyScene);
+
 	PlatformFile.FindFiles(FoundFiles, *SceneDataDirectory, TEXT(".zmx"));
 
 	for (const FString& SceneFile : FoundFiles)
@@ -189,7 +200,7 @@ void FOptiXModule::LoadSceneData()
 				if(Arguments.IsValidIndex(2))
 					SceneData.Wavelength = FCString::Atof(*Arguments[2]) *1000.0f;
 				else
-					UE_LOG(LogTemp, Warning, TEXT("Could not parse wavelength, using defualt of 500.0. Line is: '%s'."), *Line);
+					UE_LOG(LogTemp, Warning, TEXT("Could not parse wavelength, using default of 500.0. Line is: '%s'."), *Line);
 			}
 			else if (Arguments[0] == "SURF")
 			{
diff --git a/Source/ThirdParty/CUDALibrary/CUDALibrary.Build.cs b/Source/ThirdParty/CUDALibrary/CUDALibrary.Build.cs
index 70fa0b452571edce7783c9606781ecc1a279fb47..f2fa7234ae9f9a862dff2bc8a6f829b0ee50e262 100644
--- a/Source/ThirdParty/CUDALibrary/CUDALibrary.Build.cs
+++ b/Source/ThirdParty/CUDALibrary/CUDALibrary.Build.cs
@@ -77,7 +77,10 @@ public class CUDALibrary : ModuleRules
             PublicDelayLoadDLLs.Add("nvrtc-builtins64_101.dll");
             // Delay-load the DLL, so we can load it from the right place first
 
-            RuntimeDependencies.Add("cudart64_101.dll");
+            string BaseBinDir = ModuleDirectory + "/../../../Binaries/ThirdParty";
+
+
+            RuntimeDependencies.Add(BaseBinDir + "/Win64/cudart64_101.dll");
 
 
         }
diff --git a/Source/ThirdParty/OptiXLibrary/OptiXLibrary.Build.cs b/Source/ThirdParty/OptiXLibrary/OptiXLibrary.Build.cs
index a0db28fc6c7d57d527b30665cafc3728b3c8ef45..bb2277699bdc28c5a81305d90551220fa139c30d 100644
--- a/Source/ThirdParty/OptiXLibrary/OptiXLibrary.Build.cs
+++ b/Source/ThirdParty/OptiXLibrary/OptiXLibrary.Build.cs
@@ -145,6 +145,7 @@ public class OptiXLibrary : ModuleRules
                 "optix.6.5.0.dll",
                 "optix_prime.6.5.0.dll",
                 "optixu.6.5.0.dll",
+                "cudart64_101.dll"
                 //"optix_denoiser.6.0.0.dll",
                 //"optix_ssim_predictor.6.0.0.dll",
                 //"cudnn64_7.dll"