diff --git a/Assets/15_Prefabs/Waypoints.prefab b/Assets/15_Prefabs/Waypoints.prefab
index be5df3a..16e9192 100644
--- a/Assets/15_Prefabs/Waypoints.prefab
+++ b/Assets/15_Prefabs/Waypoints.prefab
@@ -228,7 +228,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6208334985588419226
 Transform:
   m_ObjectHideFlags: 0
@@ -433,6 +433,109 @@ Transform:
   - {fileID: 6593423734097067594}
   m_Father: {fileID: 8202717142006031211}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3582199055929070180
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6698792045881865934}
+  m_Layer: 0
+  m_Name: Path Treadmill Demo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6698792045881865934
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3582199055929070180}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1170441306195283109}
+  m_Father: {fileID: 8202717142006031211}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4218554392451596953
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1170441306195283109}
+  - component: {fileID: 5682263026450292309}
+  - component: {fileID: 4236027344411874421}
+  m_Layer: 0
+  m_Name: Waypoint P2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1170441306195283109
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218554392451596953}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.17654012, z: -0, w: 0.98429346}
+  m_LocalPosition: {x: -37.72, y: -32.07, z: 133.3}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6698792045881865934}
+  m_LocalEulerAnglesHint: {x: 0, y: -20.337, z: 0}
+--- !u!114 &5682263026450292309
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218554392451596953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a5c81c2052c91a74a8d9fae388fca038, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_WaypointPosition: {fileID: 1170441306195283109}
+  m_WaitTime: 120
+  m_ModelName: Treadmill
+  m_Index: 0
+  m_Touched: 0
+--- !u!65 &4236027344411874421
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218554392451596953}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &4647249922306841273
 GameObject:
   m_ObjectHideFlags: 0
@@ -536,6 +639,7 @@ Transform:
   m_Children:
   - {fileID: 7384693885281921768}
   - {fileID: 6208334985588419226}
+  - {fileID: 6698792045881865934}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &3428618077651019461
@@ -550,38 +654,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1f83b258daac8e846bed96ffebb253e3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_WaypointList:
-  - {fileID: 2913576066548479887}
-  - {fileID: 1447055275032648932}
-  - {fileID: 742592885666949308}
-  - {fileID: 2454699469966376889}
-  - {fileID: 6282629182453614422}
-  - {fileID: 1769518435772078690}
-  - {fileID: 1507026580073494728}
-  - {fileID: 6155839467370904598}
-  - {fileID: 3188686058421672639}
-  - {fileID: 7753884278351179825}
-  - {fileID: 1760641371104669356}
-  - {fileID: 194649166466171715}
-  - {fileID: 1241704643180654855}
-  - {fileID: 7765835657156386970}
+  m_WaypointList: []
   m_WaypointArray:
-  - {fileID: 2913576066548479887}
-  - {fileID: 1447055275032648932}
-  - {fileID: 742592885666949308}
-  - {fileID: 2454699469966376889}
-  - {fileID: 6282629182453614422}
-  - {fileID: 1769518435772078690}
-  - {fileID: 1507026580073494728}
-  - {fileID: 6155839467370904598}
-  - {fileID: 3188686058421672639}
-  - {fileID: 7753884278351179825}
-  - {fileID: 1760641371104669356}
-  - {fileID: 194649166466171715}
-  - {fileID: 1241704643180654855}
-  - {fileID: 7765835657156386970}
+  - {fileID: 7773461343564336651}
+  - {fileID: 401411438533769719}
   m_Target: {fileID: 0}
-  m_CurrentWaypoint: {fileID: 2913576066548479887}
+  m_CurrentWaypoint: {fileID: 7773461343564336651}
 --- !u!1 &5014766339885235049
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/1_House/Sections/Treadmill/House Content_treadmill_L_BB_SpotMini-House_2023.blend_Dupli_68.prefab b/Assets/1_House/Sections/Treadmill/House Content_treadmill_L_BB_SpotMini-House_2023.blend_Dupli_68.prefab
index fc1c7f1..fea0868 100644
--- a/Assets/1_House/Sections/Treadmill/House Content_treadmill_L_BB_SpotMini-House_2023.blend_Dupli_68.prefab	
+++ b/Assets/1_House/Sections/Treadmill/House Content_treadmill_L_BB_SpotMini-House_2023.blend_Dupli_68.prefab	
@@ -140,8 +140,8 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 314.80594, y: 346.4143, z: 124.00396}
-  m_Center: {x: 65.64429, y: 172.70718, z: 1.3665388}
+  m_Size: {x: 403.17203, y: 346.4143, z: 193.87955}
+  m_Center: {x: 21.461163, y: 172.70715, z: -4.8683996}
 --- !u!114 &5718558317385307557
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -210,6 +210,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Body: {fileID: 0}
+  m_MaxForce: 12
 --- !u!1 &8062850307700081267
 GameObject:
   m_ObjectHideFlags: 0
@@ -223,6 +224,7 @@ GameObject:
   - component: {fileID: 4091586814601344050}
   - component: {fileID: 1275989852953058885}
   - component: {fileID: 1408815079355237641}
+  - component: {fileID: 1019308114478125073}
   m_Layer: 0
   m_Name: Colliders
   m_TagString: sit
@@ -252,7 +254,7 @@ BoxCollider:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8062850307700081267}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: 6a4c79ef4b9877441b03dda6a9bd0425, type: 2}
   m_IncludeLayers:
     serializedVersion: 2
     m_Bits: 0
@@ -264,8 +266,8 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 451.8779, y: 51.695786, z: 277.63406}
-  m_Center: {x: 11.069081, y: -15.755417, z: 0.61788857}
+  m_Size: {x: 451.87787, y: 51.695786, z: 229.45038}
+  m_Center: {x: 11.06909, y: -15.755418, z: 0.23544765}
 --- !u!65 &4091586814601344050
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -273,7 +275,7 @@ BoxCollider:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8062850307700081267}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: 6a4c79ef4b9877441b03dda6a9bd0425, type: 2}
   m_IncludeLayers:
     serializedVersion: 2
     m_Bits: 0
@@ -285,8 +287,8 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 77.58215, y: 350.1854, z: 242.99796}
-  m_Center: {x: 193.25859, y: 133.48936, z: -1.1012753}
+  m_Size: {x: 77.58215, y: 117.94231, z: 242.99794}
+  m_Center: {x: 193.25859, y: 249.60974, z: -1.1014692}
 --- !u!65 &1275989852953058885
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -294,7 +296,7 @@ BoxCollider:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8062850307700081267}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: 6a4c79ef4b9877441b03dda6a9bd0425, type: 2}
   m_IncludeLayers:
     serializedVersion: 2
     m_Bits: 0
@@ -315,7 +317,7 @@ BoxCollider:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8062850307700081267}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: 6a4c79ef4b9877441b03dda6a9bd0425, type: 2}
   m_IncludeLayers:
     serializedVersion: 2
     m_Bits: 0
@@ -329,3 +331,24 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 171.31094, y: 350.18542, z: 35.10105}
   m_Center: {x: 146.3942, y: 133.48936, z: 106.963936}
+--- !u!65 &1019308114478125073
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8062850307700081267}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 113.87991, y: 25.64018, z: 183.41603}
+  m_Center: {x: 173.79678, y: 12.320123, z: 1.9299209}
diff --git a/Assets/2_Chair/Brains/Treadmill.onnx b/Assets/2_Chair/Brains/Treadmill.onnx
new file mode 100644
index 0000000..da8f64e
Binary files /dev/null and b/Assets/2_Chair/Brains/Treadmill.onnx differ
diff --git a/Assets/2_Chair/Brains/Treadmill.onnx.meta b/Assets/2_Chair/Brains/Treadmill.onnx.meta
new file mode 100644
index 0000000..26aa9b2
--- /dev/null
+++ b/Assets/2_Chair/Brains/Treadmill.onnx.meta
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: c0fc639fa2c88ef45b118b7de91428b0
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 683b6cb6d0a474744822c888b46772c9, type: 3}
+  optimizeModel: 1
+  forceArbitraryBatchSize: 1
+  treatErrorsAsWarnings: 0
+  importMode: 1
+  weightsTypeMode: 0
+  activationTypeMode: 0
diff --git a/Assets/2_Chair/Chair.prefab b/Assets/2_Chair/Chair.prefab
index f645cdd..8b9a946 100644
--- a/Assets/2_Chair/Chair.prefab
+++ b/Assets/2_Chair/Chair.prefab
@@ -850,7 +850,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5430093713008895113}
   m_Layer: 0
-  m_Name: CameraFollow-Target
+  m_Name: Chair Follow Target
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -864,13 +864,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3028507005537857522}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0.8104508, z: -0, w: 0.5858067}
-  m_LocalPosition: {x: 0.16, y: 0.75, z: -0.64}
+  m_LocalRotation: {x: -0, y: -0.88599306, z: -0, w: -0.46369848}
+  m_LocalPosition: {x: -0, y: 2.09, z: -1.4}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5732046185206465305}
-  m_LocalEulerAnglesHint: {x: 0, y: -160.58, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: -235.252, z: 0}
 --- !u!1 &3324743253852508855
 GameObject:
   m_ObjectHideFlags: 0
@@ -2037,7 +2037,7 @@ MonoBehaviour:
     VectorActionDescriptions: []
     VectorActionSpaceType: 1
     hasUpgradedBrainParametersWithActionSpec: 1
-  m_Model: {fileID: 5022602860645237092, guid: 873bd5685b6fba74da8024c42ff3f0e6, type: 3}
+  m_Model: {fileID: 5022602860645237092, guid: c0fc639fa2c88ef45b118b7de91428b0, type: 3}
   m_InferenceDevice: 1
   m_BehaviorType: 2
   m_BehaviorName: c_Walker
@@ -2062,8 +2062,8 @@ MonoBehaviour:
     maxStep: 0
   hasUpgradedFromAgentParameters: 1
   MaxStep: 0
-  m_SelectedBrain: 5
-  m_TargetWalkingSpeed: 8
+  m_SelectedBrain: 6
+  m_TargetWalkingSpeed: 10
   rWalkSpeedEachEpisode: 0
   m_RandomiseYRotation: 0
   m_RandomiseXYZRotation: 0
@@ -2131,7 +2131,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4d4f1f9b90b1b3949a25ccabbf8429d4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_InitialModel: {fileID: 5022602860645237092, guid: 873bd5685b6fba74da8024c42ff3f0e6,
+  m_InitialModel: {fileID: 5022602860645237092, guid: c0fc639fa2c88ef45b118b7de91428b0,
     type: 3}
   nnModelList:
   - {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, type: 3}
@@ -2139,6 +2139,7 @@ MonoBehaviour:
   - {fileID: 5022602860645237092, guid: 4e2e22c8058641f4f943af2d50b147f6, type: 3}
   - {fileID: 5022602860645237092, guid: 4564a8c073c3e134b96ce1698dbae60b, type: 3}
   - {fileID: 5022602860645237092, guid: 873bd5685b6fba74da8024c42ff3f0e6, type: 3}
+  - {fileID: 5022602860645237092, guid: c0fc639fa2c88ef45b118b7de91428b0, type: 3}
   agent: {fileID: 0}
   currentModel: 0
   m_currentModelName: 
diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity
index f5b5637..f76df75 100644
--- a/Assets/6_Scenes/Beep.unity
+++ b/Assets/6_Scenes/Beep.unity
@@ -234,7 +234,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 83569712}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0292018, y: 0.9690178, z: -0.14101738, w: 0.20066367}
+  m_LocalRotation: {x: 0.05010953, y: 0.8585279, z: -0.085511215, w: 0.503097}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -320,7 +320,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 155411616}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.041125163, y: 0.9588749, z: -0.19859606, w: 0.19856328}
+  m_LocalRotation: {x: 0.08004453, y: 0.8518945, z: -0.13659485, w: 0.49920982}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -897,17 +897,17 @@ PrefabInstance:
     - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -247.36
+      value: -270.62
       objectReference: {fileID: 0}
     - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 5.4000015
+      value: 6.4300003
       objectReference: {fileID: 0}
     - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 505.56
+      value: 556.76
       objectReference: {fileID: 0}
     - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
         type: 3}
@@ -1377,8 +1377,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 513050371}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.05128682, y: 0.9282864, z: -0.1397017, w: 0.34078944}
-  m_LocalPosition: {x: 7.8688507, y: -2.9973545, z: 28.754639}
+  m_LocalRotation: {x: 0.11313034, y: -0.5273416, z: 0.071099594, w: 0.83908117}
+  m_LocalPosition: {x: -8.615601, y: -2.2773552, z: 38.50769}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1565,7 +1565,7 @@ MonoBehaviour:
     LensShift: {x: 0, y: 0}
     GateFit: 1
     FocusDistance: 8.93528
-    m_SensorSize: {x: 36, y: 24}
+    m_SensorSize: {x: 1, y: 1}
     Iso: 50
     ShutterSpeed: 0.0005
     Aperture: 2.2
@@ -2086,7 +2086,7 @@ Transform:
   m_GameObject: {fileID: 1124157896}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696}
-  m_LocalPosition: {x: 10.412155, y: -3.0073547, z: 12.619812}
+  m_LocalPosition: {x: -9.45285, y: -2.2873554, z: 38.4765}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2126,7 +2126,7 @@ MonoBehaviour:
     LensShift: {x: -0, y: 0.04}
     GateFit: 1
     FocusDistance: 8.7
-    m_SensorSize: {x: 36, y: 24}
+    m_SensorSize: {x: 1, y: 1}
     Iso: 50
     ShutterSpeed: 0.0005
     Aperture: 2.2
@@ -2279,7 +2279,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1178814724}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.023507642, y: 0.96850884, z: -0.1004793, w: 0.22658756}
+  m_LocalRotation: {x: 0.09136775, y: 0.81985533, z: -0.13657285, w: 0.54848623}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -2575,35 +2575,25 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 707081199}
     m_Modifications:
-    - target: {fileID: 132943785400354123, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2225134942834663317, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -246.95
+      value: -271.75
       objectReference: {fileID: 0}
     - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 6.76
+      value: 7.48
       objectReference: {fileID: 0}
     - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 536.2
+      value: 560.345
       objectReference: {fileID: 0}
     - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.92896694
+      value: 0.27667493
       objectReference: {fileID: 0}
     - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
@@ -2613,7 +2603,7 @@ PrefabInstance:
     - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.3701628
+      value: -0.9609636
       objectReference: {fileID: 0}
     - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
@@ -2628,179 +2618,23 @@ PrefabInstance:
     - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 43.451
+      value: -147.876
       objectReference: {fileID: 0}
     - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2907507614063161647, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3022150810398622485, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3028507005537857522, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Name
-      value: Chair Follow Target
-      objectReference: {fileID: 0}
-    - target: {fileID: 3028507005537857522, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3324743253852508855, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3382247266651750635, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3396719268153385903, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3625633691884277986, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3677055482454108232, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4068785188318556655, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4300977326172810481, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4685213736971843660, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4871452371939253621, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5303318861142065255, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5430093713008895113, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5430093713008895113, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 2.09
-      objectReference: {fileID: 0}
-    - target: {fileID: 5430093713008895113, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -1.4
-      objectReference: {fileID: 0}
-    - target: {fileID: 5430093713008895113, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.46369848
-      objectReference: {fileID: 0}
-    - target: {fileID: 5430093713008895113, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.88599306
-      objectReference: {fileID: 0}
-    - target: {fileID: 5430093713008895113, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: -235.252
-      objectReference: {fileID: 0}
-    - target: {fileID: 5771439526206961800, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 5777259271730693716, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
       propertyPath: m_Name
       value: Chair
       objectReference: {fileID: 0}
-    - target: {fileID: 5777259271730693716, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6163716254022380080, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 6191786620621186661, guid: f03606b436da1d94e977c8ffa2825bd9,
         type: 3}
       propertyPath: target
       value: 
       objectReference: {fileID: 387060610}
-    - target: {fileID: 6191786620621186661, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6628358011295906335, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6794064008694923825, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7331846505223066426, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7470254353610657185, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8187530526923920244, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8187530526923920244, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_InitialModel
-      value: 
-      objectReference: {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522,
-        type: 3}
-    - target: {fileID: 8666002640045771141, guid: f03606b436da1d94e977c8ffa2825bd9,
-        type: 3}
-      propertyPath: m_Layer
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -3830,11 +3664,6 @@ PrefabInstance:
       propertyPath: m_Target
       value: 
       objectReference: {fileID: 387060610}
-    - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386,
-        type: 3}
-      propertyPath: m_WaypointList.Array.size
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 4823915812732403376, guid: 796c0c7bfd2e89547bd866eedcc6d386,
         type: 3}
       propertyPath: m_Name
@@ -3968,6 +3797,31 @@ PrefabInstance:
       propertyPath: m_CollisionEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
       objectReference: {fileID: 219793651}
+    - target: {fileID: 8388431903594169060, guid: 14d8283abcefffd4a916b8611ccd49fa,
+        type: 3}
+      propertyPath: m_Size.y
+      value: 51.69578
+      objectReference: {fileID: 0}
+    - target: {fileID: 8388431903594169060, guid: 14d8283abcefffd4a916b8611ccd49fa,
+        type: 3}
+      propertyPath: m_Size.z
+      value: 271.4547
+      objectReference: {fileID: 0}
+    - target: {fileID: 8388431903594169060, guid: 14d8283abcefffd4a916b8611ccd49fa,
+        type: 3}
+      propertyPath: m_Center.x
+      value: 11.069097
+      objectReference: {fileID: 0}
+    - target: {fileID: 8388431903594169060, guid: 14d8283abcefffd4a916b8611ccd49fa,
+        type: 3}
+      propertyPath: m_Center.y
+      value: -15.755419
+      objectReference: {fileID: 0}
+    - target: {fileID: 8388431903594169060, guid: 14d8283abcefffd4a916b8611ccd49fa,
+        type: 3}
+      propertyPath: m_Center.z
+      value: 1.294921
+      objectReference: {fileID: 0}
     - target: {fileID: 8896637230412496375, guid: 14d8283abcefffd4a916b8611ccd49fa,
         type: 3}
       propertyPath: m_Name
diff --git a/Assets/7_Scripts/Interactable Items/Treadmill.cs b/Assets/7_Scripts/Interactable Items/Treadmill.cs
index c2ab007..ee96488 100644
--- a/Assets/7_Scripts/Interactable Items/Treadmill.cs	
+++ b/Assets/7_Scripts/Interactable Items/Treadmill.cs	
@@ -1,11 +1,14 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Unity.VisualScripting;
 using UnityEngine;
 
 public class Treadmill : MonoBehaviour
 {
     public Rigidbody m_Body;
     private float m_Force;
+    public float m_MaxForce;
     private float m_angleOffset;
 
     private void OnEnable()
@@ -16,26 +19,26 @@ public class Treadmill : MonoBehaviour
 
     public void ApplyForce()
     {
-        // m_Force += 0.1f;
-        // float m_ClampedForce = Mathf.Clamp(m_Force, 0f, 100f);
-        m_Force += 0.2f;
-        Debug.Log($"Applying Force {m_Force}");
-        Vector3 forceDirection = Quaternion.Euler(0, -m_angleOffset, 0) * Vector3.back;
+        m_Force += 0.1f;
+        Vector3 forceDirection = Quaternion.Euler(0, -m_angleOffset, 0) * Vector3.forward;
         m_Body.AddForce(forceDirection * m_Force);
     }
 
     public void RemoveForce()
     {
-        Debug.Log("Removing Treadmill Force");
         m_Force = 0;
     }
 
     private void FixedUpdate()
     {
-        m_Force -= 0.05f;
-        if (m_Force < 0f)
-        {
-            m_Force = 0;
-        }
+        //Debug.Log($"Applying Force {m_Force}");
+        m_Force = (m_Force < 0f) ? 0 : (m_Force > m_MaxForce) ? m_MaxForce : m_Force;
     }
-}
+
+    private void OnDrawGizmosSelected()
+    {
+        // Draw a line representing the force direction
+        Gizmos.color = Color.red;
+        Gizmos.DrawRay(transform.position, Quaternion.Euler(0, -m_angleOffset, 0) * Vector3.forward);
+    }
+}
\ No newline at end of file
diff --git a/Assets/7_Scripts/Model Swapping/ModelSwap.cs b/Assets/7_Scripts/Model Swapping/ModelSwap.cs
index e54754b..13aa646 100644
--- a/Assets/7_Scripts/Model Swapping/ModelSwap.cs	
+++ b/Assets/7_Scripts/Model Swapping/ModelSwap.cs	
@@ -28,13 +28,13 @@ public class ModelSwap : MonoBehaviour
 
     private void OnEnable()
     {
-        Waypoint.SwapModelOnWaypointReached += SwapModelOnReachingWaypoint;
+        WaypointManager.SwapModelOnWaypointReached += SwapModelOnReachingWaypoint;
         WaypointManager.OnOverrideWaypoint += SwitchModelOverride;
     }
 
     private void OnDisable()
     {
-        Waypoint.SwapModelOnWaypointReached -= SwapModelOnReachingWaypoint;
+        WaypointManager.SwapModelOnWaypointReached -= SwapModelOnReachingWaypoint;
         WaypointManager.OnOverrideWaypoint += SwitchModelOverride;
     }
 
@@ -74,6 +74,11 @@ public class ModelSwap : MonoBehaviour
             agent.m_SelectedBrain = Walker.Brain.Sitting;
             m_currentModelName = modelName;
         }
+        else if (modelName.Equals("Treadmill"))
+        {
+            agent.m_SelectedBrain = Walker.Brain.Treadmill;
+            m_currentModelName = modelName;
+        }
 
         Debug.Log("Current Model: " + nnModelList[currentModel].name);
     }
diff --git a/Assets/7_Scripts/Waypoint/Waypoint.cs b/Assets/7_Scripts/Waypoint/Waypoint.cs
index 2b0f5cd..0c32cb3 100644
--- a/Assets/7_Scripts/Waypoint/Waypoint.cs
+++ b/Assets/7_Scripts/Waypoint/Waypoint.cs
@@ -21,14 +21,10 @@ public class Waypoint : MonoBehaviour
 
     public bool m_Touched;
 
-    public delegate void WaypointReached(float index);
+    public delegate void WaypointReached(float index, string modelName);
 
     public static event WaypointReached OnWaypointReached;
 
-    public delegate void SwapModelOnReachingWaypoint(string modelName);
-
-    public static event SwapModelOnReachingWaypoint SwapModelOnWaypointReached;
-
     private void OnEnable()
     {
         m_WaypointPosition = this.transform;
@@ -47,13 +43,7 @@ public class Waypoint : MonoBehaviour
         if (OnWaypointReached != null && !m_Touched)
         {
             m_Touched = true;
-            OnWaypointReached(m_Index);
-
-            if (!string.IsNullOrEmpty(m_ModelName))
-            {
-                SwapModelOnWaypointReached(m_ModelName);
-            }
-
+            OnWaypointReached(m_Index, m_ModelName);
         }
     }
 }
diff --git a/Assets/7_Scripts/Waypoint/WaypointManager.cs b/Assets/7_Scripts/Waypoint/WaypointManager.cs
index 5cce408..f8b383f 100644
--- a/Assets/7_Scripts/Waypoint/WaypointManager.cs
+++ b/Assets/7_Scripts/Waypoint/WaypointManager.cs
@@ -21,6 +21,10 @@ public class WaypointManager : MonoBehaviour
     [SerializeField]
     public Waypoint m_CurrentWaypoint;
 
+    public delegate void SwapModelOnReachingWaypoint(string modelName);
+
+    public static event SwapModelOnReachingWaypoint SwapModelOnWaypointReached;
+
     public delegate void OverrideWaypoint(string modelName);
 
     public static event OverrideWaypoint OnOverrideWaypoint;
@@ -55,7 +59,21 @@ public class WaypointManager : MonoBehaviour
         m_Target.position = wpPosition;
     }
 
-    private void SetNextWaypoint(float index)
+    private void SetNextWaypoint(float index, string modelName)
+    {
+        if (index == m_CurrentWaypoint.m_Index)
+        {
+            Debug.Log($"Waypoint reached {index}");
+            MoveToNextWaypoint(index);
+            SwapModelOnWaypointReached(modelName);
+        }
+        else
+        {
+            Debug.Log($"Wrong Waypoint reached {index} Current {m_CurrentWaypoint.m_Index}");
+        }
+    }
+
+    private void SetNextWaypointOverride(float index)
     {
         if (index == m_CurrentWaypoint.m_Index)
         {
@@ -116,7 +134,7 @@ public class WaypointManager : MonoBehaviour
     {
         if(Input.GetKeyUp(KeyCode.F))
         {
-            SetNextWaypoint(m_CurrentWaypoint.m_Index);
+            SetNextWaypointOverride(m_CurrentWaypoint.m_Index);
             OnOverrideWaypoint(m_CurrentWaypoint.m_ModelName);
         }
     }
diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json
index a4508f8..7978f30 100644
--- a/Assets/ML-Agents/Timers/Beep_timers.json
+++ b/Assets/ML-Agents/Timers/Beep_timers.json
@@ -1 +1 @@
-{"count":1,"self":72.525030399999991,"total":73.2600934,"children":{"InitializeActuators":{"count":1,"self":0.0009985,"total":0.0009985,"children":null},"InitializeSensors":{"count":1,"self":0.0020176,"total":0.0020176,"children":null},"AgentSendState":{"count":2273,"self":0.019615,"total":0.310337,"children":{"CollectObservations":{"count":455,"self":0.0135715,"total":0.0135715,"children":null},"WriteActionMask":{"count":455,"self":0,"total":0,"children":null},"RequestDecision":{"count":455,"self":0.27715049999999997,"total":0.27715049999999997,"children":null}}},"DecideAction":{"count":2273,"self":0.39756949999999996,"total":0.4000949,"children":{"RayPerceptionSensor.Perceive":{"count":455,"self":0.0025253999999999997,"total":0.0025253999999999997,"children":null}}},"AgentAct":{"count":2273,"self":0.0206171,"total":0.0206171,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710252555","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_02-Beep\\4_Unity\\Beep Final Git\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1710252628"}}
\ No newline at end of file
+{"count":1,"self":25.8160128,"total":26.1623217,"children":{"InitializeActuators":{"count":1,"self":0.0010069,"total":0.0010069,"children":null},"InitializeSensors":{"count":1,"self":0.0009998,"total":0.0009998,"children":null},"AgentSendState":{"count":1004,"self":0.0093143999999999987,"total":0.0374824,"children":{"CollectObservations":{"count":201,"self":0.0095474,"total":0.0095474,"children":null},"WriteActionMask":{"count":201,"self":0.0010012,"total":0.0010012,"children":null},"RequestDecision":{"count":201,"self":0.0176194,"total":0.0176194,"children":null}}},"DecideAction":{"count":1004,"self":0.2716733,"total":0.3002837,"children":{"RayPerceptionSensor.Perceive":{"count":201,"self":0.028610399999999998,"total":0.028610399999999998,"children":null}}},"AgentAct":{"count":1004,"self":0.0055324,"total":0.0055324,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710256140","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_02-Beep\\4_Unity\\Beep Final Git\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1710256166"}}
\ No newline at end of file
diff --git a/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile-surveillance.asset b/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile-surveillance.asset
index a8c8a7a..60dd1f1 100644
--- a/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile-surveillance.asset
+++ b/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile-surveillance.asset
@@ -213,7 +213,7 @@ MonoBehaviour:
   active: 1
   enable:
     m_OverrideState: 1
-    m_Value: 1
+    m_Value: 0
   layerMask:
     m_OverrideState: 1
     m_Value: