diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity
index d93b3c5d6..db1ac632a 100644
--- a/BlueWater/Assets/01.Scenes/02.Main.unity
+++ b/BlueWater/Assets/01.Scenes/02.Main.unity
@@ -41963,89 +41963,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1827154744}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1102797976
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 373994165391779788, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_Convex
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 373994165391779788, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2987405546353765599, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_Name
-      value: Boat
-      objectReference: {fileID: 0}
-    - target: {fileID: 7008410020683778052, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -36.999
-      objectReference: {fileID: 0}
-    - target: {fileID: 7008410020683778052, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7008410020683778052, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 7008410020683778052, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7008410020683778052, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7008410020683778052, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7008410020683778052, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7008410020683778052, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7008410020683778052, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7008410020683778052, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9122999611070572703, guid: 96173da392e9a408d9aea814b4cfe00e,
-        type: 3}
-      propertyPath: waveGenerator
-      value: 
-      objectReference: {fileID: 1560348105}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 96173da392e9a408d9aea814b4cfe00e, type: 3}
 --- !u!1001 &1103483014
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -47742,7 +47659,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 616a7216aa8754444908b58052d4b644, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  waveGenerator: {fileID: 1560348105}
   boatOffset: -0.4
 --- !u!1001 &1184459613
 PrefabInstance:
@@ -94287,4 +94203,3 @@ SceneRoots:
   - {fileID: 1300315323}
   - {fileID: 1395280334}
   - {fileID: 1379785728}
-  - {fileID: 1102797976}
diff --git a/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs
index b54bd7a3b..33b408b64 100644
--- a/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs	
+++ b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs	
@@ -4,12 +4,13 @@ using UnityEngine;
 
 public class Floater : MonoBehaviour
 {
-    public GerstnerWave waveGenerator;
+    private GerstnerWave waveGenerator;
     public float boatOffset = 0.0f;  // new variable
     private Rigidbody rb;
 
     private void Start()
     {
+        waveGenerator = FindObjectOfType<GerstnerWave>();
         rb = GetComponent<Rigidbody>();
     }
 
diff --git a/BlueWater/Assets/05.Prefabs/Boat.prefab b/BlueWater/Assets/05.Prefabs/Boat.prefab
index 52ae5321f..743f51d19 100644
--- a/BlueWater/Assets/05.Prefabs/Boat.prefab
+++ b/BlueWater/Assets/05.Prefabs/Boat.prefab
@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7008410020683778052}
-  - component: {fileID: 6804171890931384686}
+  - component: {fileID: 373994165391779788}
   - component: {fileID: 2943319250391778232}
   - component: {fileID: 9122999611070572703}
   - component: {fileID: 9011106761725659084}
@@ -37,7 +37,7 @@ Transform:
   - {fileID: 8576618138905002859}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!64 &6804171890931384686
+--- !u!64 &373994165391779788
 MeshCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -82,7 +82,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 0
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -113,7 +113,7 @@ NavMeshAgent:
   m_Speed: 3.5
   m_Acceleration: 8
   avoidancePriority: 50
-  m_AngularSpeed: 120
+  m_AngularSpeed: 500
   m_StoppingDistance: 0
   m_AutoTraverseOffMeshLink: 1
   m_AutoBraking: 1