diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
index d8f34a38..46773470 100644
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -12,4 +12,15 @@ r.RayTracing=True
 r.MinScreenRadiusForLights=0.010000
 r.ReflectionCaptureResolution=256
 r.VirtualTextures=True
+r.DefaultFeature.AntiAliasing=1
+
+[/Script/EngineSettings.GameMapsSettings]
+GlobalDefaultGameMode=/Game/Blueprints/Player/myGM.myGM_C
+GameInstanceClass=/Game/Blueprints/Player/GI.GI_C
+
+[/Script/Engine.StreamingSettings]
+s.AsyncLoadingTimeLimit=2.000000
+s.PriorityAsyncLoadingExtraTime=6.000000
+s.LevelStreamingActorsUpdateTimeLimit=2.000000
+s.LevelStreamingComponentsRegistrationGranularity=5
 
diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
new file mode 100644
index 00000000..62cb34a6
--- /dev/null
+++ b/Config/DefaultInput.ini
@@ -0,0 +1,101 @@
+<<<<<<< Updated upstream
+
+
+[/Script/Engine.InputSettings]
+-AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
+-AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
+-AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
++AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseWheelAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_LeftTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Daydream_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Daydream_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Daydream_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Daydream_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusGo_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusGo_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusGo_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusGo_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Touch",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
+bAltEnterTogglesFullscreen=True
+bF11TogglesFullscreen=True
+bUseMouseForTouch=True
+bEnableMouseSmoothing=False
+bEnableFOVScaling=False
+bCaptureMouseOnLaunch=True
+bAlwaysShowTouchInterface=False
+bShowConsoleOnFourFingerTap=True
+bEnableGestureRecognizer=False
+bUseAutocorrect=False
+DefaultViewportMouseCaptureMode=CapturePermanently
+DefaultViewportMouseLockMode=DoNotLock
+FOVScale=0.011110
+DoubleClickTime=0.200000
++AxisMappings=(AxisName="right",Scale=1.000000,Key=right)
++AxisMappings=(AxisName="forward",Scale=1.000000,Key=Up)
++AxisMappings=(AxisName="right",Scale=-1.000000,Key=Left)
++AxisMappings=(AxisName="right",Scale=1.000000,Key=D)
++AxisMappings=(AxisName="right",Scale=-1.000000,Key=A)
++AxisMappings=(AxisName="forward",Scale=-1.000000,Key=Down)
++AxisMappings=(AxisName="forward",Scale=1.000000,Key=W)
++AxisMappings=(AxisName="forward",Scale=-1.000000,Key=S)
+DefaultPlayerInputClass=/Script/Engine.PlayerInput
+DefaultInputComponentClass=/Script/Engine.InputComponent
+DefaultTouchInterface=None
+-ConsoleKeys=Tilde
++ConsoleKeys=Tilde
++ConsoleKeys=None
+
diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset
index 53e84500..3622edda 100644
Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ
diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset
index 9ab55b22..f0d1f789 100644
Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ
diff --git a/Content/Blueprints/UI/Actors/InfraPoint.uasset b/Content/Blueprints/UI/Actors/InfraPoint.uasset
index c8e20c77..7fd1fb24 100644
Binary files a/Content/Blueprints/UI/Actors/InfraPoint.uasset and b/Content/Blueprints/UI/Actors/InfraPoint.uasset differ
diff --git a/Content/Blueprints/UI/Actors/districtPoint.uasset b/Content/Blueprints/UI/Actors/districtPoint.uasset
index 464a58f1..5a49f6ee 100644
Binary files a/Content/Blueprints/UI/Actors/districtPoint.uasset and b/Content/Blueprints/UI/Actors/districtPoint.uasset differ
diff --git a/Content/Blueprints/UI/Actors/villaPoint.uasset b/Content/Blueprints/UI/Actors/villaPoint.uasset
index 6e78c2f2..572bb013 100644
Binary files a/Content/Blueprints/UI/Actors/villaPoint.uasset and b/Content/Blueprints/UI/Actors/villaPoint.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/Compass.uasset b/Content/Blueprints/UI/Widgets/Elements/Compass.uasset
index 56a23aea..8cb4fb6f 100644
Binary files a/Content/Blueprints/UI/Widgets/Elements/Compass.uasset and b/Content/Blueprints/UI/Widgets/Elements/Compass.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset b/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset
index b5e8f1c9..af89c3b9 100644
Binary files a/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset and b/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/styledText.uasset b/Content/Blueprints/UI/Widgets/Elements/styledText.uasset
index ca59d5c5..7a68be0f 100644
Binary files a/Content/Blueprints/UI/Widgets/Elements/styledText.uasset and b/Content/Blueprints/UI/Widgets/Elements/styledText.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Marker/Point.uasset b/Content/Blueprints/UI/Widgets/Marker/Point.uasset
index 815d59c4..3a8062ff 100644
Binary files a/Content/Blueprints/UI/Widgets/Marker/Point.uasset and b/Content/Blueprints/UI/Widgets/Marker/Point.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Submenu/Infrastruct.uasset b/Content/Blueprints/UI/Widgets/Submenu/Infrastruct.uasset
index e8309790..b3e71858 100644
Binary files a/Content/Blueprints/UI/Widgets/Submenu/Infrastruct.uasset and b/Content/Blueprints/UI/Widgets/Submenu/Infrastruct.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/menu/mainMenu.uasset b/Content/Blueprints/UI/Widgets/menu/mainMenu.uasset
index 534b4aac..70f5dfa5 100644
Binary files a/Content/Blueprints/UI/Widgets/menu/mainMenu.uasset and b/Content/Blueprints/UI/Widgets/menu/mainMenu.uasset differ
diff --git a/Content/Maps/Light.umap b/Content/Maps/Light.umap
index bf1c2287..16cdcbc1 100644
Binary files a/Content/Maps/Light.umap and b/Content/Maps/Light.umap differ
diff --git a/Content/Maps/Main.umap b/Content/Maps/Main.umap
index 4cb8d248..cc5746d9 100644
Binary files a/Content/Maps/Main.umap and b/Content/Maps/Main.umap differ
diff --git a/Content/Maps/points/points.umap b/Content/Maps/points/points.umap
index 9e673d14..22c7adfc 100644
Binary files a/Content/Maps/points/points.umap and b/Content/Maps/points/points.umap differ
diff --git a/Content/Maps/points/pointsVillas10.umap b/Content/Maps/points/pointsVillas10.umap
index 054bcf97..a07b3e07 100644
Binary files a/Content/Maps/points/pointsVillas10.umap and b/Content/Maps/points/pointsVillas10.umap differ