diff --git a/Assets/Prefabs/Traps/Conveyor Belt with Cube.prefab b/Assets/Prefabs/Traps/Conveyor Belt with Cube.prefab
index 4c01f65..73872e1 100644
--- a/Assets/Prefabs/Traps/Conveyor Belt with Cube.prefab	
+++ b/Assets/Prefabs/Traps/Conveyor Belt with Cube.prefab	
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2430657395993931422
+--- !u!1 &1141755146290067
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,38 +8,99 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 437627090}
-  - component: {fileID: 859222414598846322}
+  - component: {fileID: 4490968977809283}
+  - component: {fileID: 33922994427887733}
+  - component: {fileID: 23937057364958257}
+  - component: {fileID: 3845129242341207909}
+  - component: {fileID: 5867501616828889193}
   m_Layer: 0
-  m_Name: Conveyor Belt with Cube
-  m_TagString: Untagged
+  m_Name: Cube_GroundWGrass
+  m_TagString: Coloured
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 4294967295
   m_IsActive: 1
---- !u!4 &437627090
+--- !u!4 &4490968977809283
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2430657395993931422}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 7287252781365539386}
-  - {fileID: 4490968977809283}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
+  - {fileID: 4721099854274309}
+  - {fileID: 4721099527720510}
+  m_Father: {fileID: 437627090}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &859222414598846322
+--- !u!33 &33922994427887733
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Mesh: {fileID: 4300000, guid: d73f25ac0bcef5b469863e30ce33634b, type: 3}
+--- !u!23 &23937057364958257
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a12203d8d2df33d4f814e1a381ba565f, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &3845129242341207909
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1.0000005, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &5867501616828889193
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2430657395993931422}
+  m_GameObject: {fileID: 1141755146290067}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 6692f0c965cb4fa41b616ba0991653a3, type: 3}
@@ -49,9 +110,43 @@ MonoBehaviour:
   is_Walkable: 1
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 0
   isSpawnable: 0
   SpawnDirection: 2
   Action: {fileID: 11400000, guid: 0b1bcd75cb7dade4fb598ee3412594c2, type: 2}
+--- !u!1 &2430657395993931422
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 437627090}
+  m_Layer: 0
+  m_Name: Conveyor Belt with Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &437627090
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2430657395993931422}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 7287252781365539386}
+  - {fileID: 4490968977809283}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3424486742927057916
 GameObject:
   m_ObjectHideFlags: 0
@@ -63,7 +158,6 @@ GameObject:
   - component: {fileID: 7287252781365539386}
   - component: {fileID: 1376194202737726602}
   - component: {fileID: 7909594284434926968}
-  - component: {fileID: 1386403355058630248}
   m_Layer: 0
   m_Name: Plane
   m_TagString: Untagged
@@ -130,20 +224,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!64 &1386403355058630248
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3424486742927057916}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &589977586
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -151,6 +231,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4490968977809283}
     m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundL
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -195,16 +283,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundL
-      objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+--- !u!4 &4721099527720510 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
+    type: 3}
+  m_PrefabInstance: {fileID: 589977586}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &816154313
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -212,6 +298,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4490968977809283}
     m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundU
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -256,92 +350,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundU
-      objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
---- !u!1001 &1100376119
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 437627090}
-    m_Modifications:
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundWGrass
-      objectReference: {fileID: 0}
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_TagString
-      value: Coloured
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
---- !u!4 &4490968977809283 stripped
+--- !u!4 &4721099854274309 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291,
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
     type: 3}
-  m_PrefabInstance: {fileID: 1100376119}
+  m_PrefabInstance: {fileID: 816154313}
   m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/Traps/CrushingBoulder.prefab b/Assets/Prefabs/Traps/CrushingBoulder.prefab
index 88d2f41..a802d05 100644
--- a/Assets/Prefabs/Traps/CrushingBoulder.prefab
+++ b/Assets/Prefabs/Traps/CrushingBoulder.prefab
@@ -257,6 +257,8 @@ MonoBehaviour:
   is_Walkable: 0
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 1
   isSpawnable: 0
   SpawnDirection: 2
   countdowntimer: 3
@@ -390,6 +392,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 6745622317302131140}
     m_Modifications:
+    - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
+      propertyPath: m_Name
+      value: Rock_2 (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4614242176542224, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -442,14 +452,6 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 1.2289
       objectReference: {fileID: 0}
-    - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
-      propertyPath: m_Name
-      value: Rock_2 (2)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
 --- !u!4 &6741087515541790872 stripped
diff --git a/Assets/Prefabs/Traps/CubeWithCrystals.prefab b/Assets/Prefabs/Traps/CubeWithCrystals.prefab
index 270c434..d5620d2 100644
--- a/Assets/Prefabs/Traps/CubeWithCrystals.prefab
+++ b/Assets/Prefabs/Traps/CubeWithCrystals.prefab
@@ -82,9 +82,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 80f123a8ae7c42549bd1daccb6fe61e0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  VisualOffset: {x: 0, y: 0, z: 0}
+  is_Walkable: 1
+  isWater: 0
+  isPit: 0
+  isCrystals: 1
+  isRock: 0
+  isSpawnable: 0
+  SpawnDirection: 2
   crystals: {fileID: 7009033047396183185}
-  triggeranimate: 0
-  triggeranimate1: 0
 --- !u!65 &1952366153
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -114,6 +120,8 @@ MonoBehaviour:
   is_Walkable: 1
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 0
   isSpawnable: 0
   SpawnDirection: 2
 --- !u!1001 &9119206197491717339
@@ -123,6 +131,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 6222932897940046940}
     m_Modifications:
+    - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
+      propertyPath: m_Name
+      value: Crystal2_Blue
+      objectReference: {fileID: 0}
+    - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4025485266255164, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.234
@@ -167,14 +183,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
-      propertyPath: m_Name
-      value: Crystal2_Blue
-      objectReference: {fileID: 0}
-    - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
 --- !u!4 &9116306614291212775 stripped
@@ -190,6 +198,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 6222932897940046940}
     m_Modifications:
+    - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
+      propertyPath: m_Name
+      value: Crystal2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4461811097192420, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0.276
@@ -234,14 +250,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
-      propertyPath: m_Name
-      value: Crystal2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
 --- !u!4 &9115906075035381432 stripped
@@ -324,6 +332,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 6222932897940046940}
     m_Modifications:
+    - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
+      propertyPath: m_Name
+      value: Crystal2_Orange
+      objectReference: {fileID: 0}
+    - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4315419121807260, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.208
@@ -368,14 +384,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
-      propertyPath: m_Name
-      value: Crystal2_Orange
-      objectReference: {fileID: 0}
-    - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
 --- !u!4 &9116052424124833850 stripped
@@ -391,6 +399,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 9119206199061355250}
     m_Modifications:
+    - target: {fileID: 1681195754145498, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundWGrass_6
+      objectReference: {fileID: 0}
     - target: {fileID: 4128166634420518, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -435,10 +447,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1681195754145498, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundWGrass_6
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3}
 --- !u!4 &9116208357191883012 stripped
diff --git a/Assets/Prefabs/Traps/ShootingCannon + Block.prefab b/Assets/Prefabs/Traps/ShootingCannon + Block.prefab
index 1d6d7ce..d72ac94 100644
--- a/Assets/Prefabs/Traps/ShootingCannon + Block.prefab	
+++ b/Assets/Prefabs/Traps/ShootingCannon + Block.prefab	
@@ -1,5 +1,98 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4265838743719489735
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4546202105378142430}
+  - component: {fileID: 6378600946085240914}
+  - component: {fileID: 111341246151501818}
+  - component: {fileID: 3488332760092905348}
+  m_Layer: 0
+  m_Name: Cube_GroundWGrass
+  m_TagString: Coloured
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!4 &4546202105378142430
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4265838743719489735}
+  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_Children:
+  - {fileID: 4541774030144991256}
+  - {fileID: 4541774030055075990}
+  m_Father: {fileID: 6179448856766749153}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6378600946085240914
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4265838743719489735}
+  m_Mesh: {fileID: 4300000, guid: d73f25ac0bcef5b469863e30ce33634b, type: 3}
+--- !u!23 &111341246151501818
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4265838743719489735}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a12203d8d2df33d4f814e1a381ba565f, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &3488332760092905348
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4265838743719489735}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1.0000005, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &6179448856766749154
 GameObject:
   m_ObjectHideFlags: 0
@@ -51,6 +144,8 @@ MonoBehaviour:
   is_Walkable: 0
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 0
   isSpawnable: 0
   SpawnDirection: 2
   shootingRight: 1
@@ -434,67 +529,137 @@ MonoBehaviour:
   - {fileID: 0}
   - {fileID: 0}
   m_maskType: 0
---- !u!1001 &4546202105798836939
+--- !u!1001 &4546202104718436698
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 6179448856766749153}
+    m_TransformParent: {fileID: 4546202105378142430}
     m_Modifications:
-    - target: {fileID: 298388790206689804, guid: bb9ffc1c11072174694465b720cdb319,
-        type: 3}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_Name
-      value: Cube_GroundWGrass
+      value: Cube_GroundL
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.y
+      value: -2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+--- !u!4 &4541774030055075990 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
+    type: 3}
+  m_PrefabInstance: {fileID: 4546202104718436698}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4546202104896956884
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4546202105378142430}
+    m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundU
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalRotation.x
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
---- !u!4 &4546202105378142430 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+--- !u!4 &4541774030144991256 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319,
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
     type: 3}
-  m_PrefabInstance: {fileID: 4546202105798836939}
+  m_PrefabInstance: {fileID: 4546202104896956884}
   m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/Traps/Turntable L with Cube.prefab b/Assets/Prefabs/Traps/Turntable L with Cube.prefab
index bebbff1..cc853a9 100644
--- a/Assets/Prefabs/Traps/Turntable L with Cube.prefab	
+++ b/Assets/Prefabs/Traps/Turntable L with Cube.prefab	
@@ -1,5 +1,99 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1141755146290067
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4490968977809283}
+  - component: {fileID: 33922994427887733}
+  - component: {fileID: 23937057364958257}
+  - component: {fileID: 3845129242341207909}
+  - component: {fileID: 8900644542252474285}
+  m_Layer: 0
+  m_Name: Cube_GroundWGrass
+  m_TagString: Coloured
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!4 &4490968977809283
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4721099854274309}
+  - {fileID: 4721099527720510}
+  m_Father: {fileID: 437627090}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &33922994427887733
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Mesh: {fileID: 4300000, guid: d73f25ac0bcef5b469863e30ce33634b, type: 3}
+--- !u!23 &23937057364958257
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a12203d8d2df33d4f814e1a381ba565f, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &3845129242341207909
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1.0000005, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &8900644542252474285
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -16,6 +110,8 @@ MonoBehaviour:
   is_Walkable: 1
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 0
   isSpawnable: 0
   SpawnDirection: 2
   Action: {fileID: 11400000, guid: aa238796cf1886244951ec8c2fed1855, type: 2}
@@ -150,6 +246,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4490968977809283}
     m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundL
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -194,16 +298,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundL
-      objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+--- !u!4 &4721099527720510 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
+    type: 3}
+  m_PrefabInstance: {fileID: 589977586}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &816154313
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -211,6 +313,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4490968977809283}
     m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundU
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -255,98 +365,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundU
-      objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
---- !u!1001 &1100376119
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 437627090}
-    m_Modifications:
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundWGrass
-      objectReference: {fileID: 0}
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_TagString
-      value: Coloured
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
---- !u!1 &1141755146290067 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291,
-    type: 3}
-  m_PrefabInstance: {fileID: 1100376119}
-  m_PrefabAsset: {fileID: 0}
---- !u!4 &4490968977809283 stripped
+--- !u!4 &4721099854274309 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291,
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
     type: 3}
-  m_PrefabInstance: {fileID: 1100376119}
+  m_PrefabInstance: {fileID: 816154313}
   m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/Traps/Turntable R with Cube.prefab b/Assets/Prefabs/Traps/Turntable R with Cube.prefab
index 13b2d7c..a29f9c8 100644
--- a/Assets/Prefabs/Traps/Turntable R with Cube.prefab	
+++ b/Assets/Prefabs/Traps/Turntable R with Cube.prefab	
@@ -1,5 +1,99 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1141755146290067
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4490968977809283}
+  - component: {fileID: 33922994427887733}
+  - component: {fileID: 23937057364958257}
+  - component: {fileID: 3845129242341207909}
+  - component: {fileID: 8900644542252474285}
+  m_Layer: 0
+  m_Name: Cube_GroundWGrass
+  m_TagString: Coloured
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!4 &4490968977809283
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4721099854274309}
+  - {fileID: 4721099527720510}
+  m_Father: {fileID: 437627090}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &33922994427887733
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Mesh: {fileID: 4300000, guid: d73f25ac0bcef5b469863e30ce33634b, type: 3}
+--- !u!23 &23937057364958257
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a12203d8d2df33d4f814e1a381ba565f, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &3845129242341207909
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1.0000005, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &8900644542252474285
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -16,6 +110,8 @@ MonoBehaviour:
   is_Walkable: 1
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 0
   isSpawnable: 0
   SpawnDirection: 2
   Action: {fileID: 11400000, guid: 41f4cb946475b2849a802a8297d81e25, type: 2}
@@ -150,6 +246,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4490968977809283}
     m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundL
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -194,16 +298,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundL
-      objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+--- !u!4 &4721099527720510 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
+    type: 3}
+  m_PrefabInstance: {fileID: 589977586}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &816154313
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -211,6 +313,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4490968977809283}
     m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundU
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -255,98 +365,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundU
-      objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
---- !u!1001 &1100376119
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 437627090}
-    m_Modifications:
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundWGrass
-      objectReference: {fileID: 0}
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_TagString
-      value: Coloured
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
---- !u!1 &1141755146290067 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291,
-    type: 3}
-  m_PrefabInstance: {fileID: 1100376119}
-  m_PrefabAsset: {fileID: 0}
---- !u!4 &4490968977809283 stripped
+--- !u!4 &4721099854274309 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291,
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
     type: 3}
-  m_PrefabInstance: {fileID: 1100376119}
+  m_PrefabInstance: {fileID: 816154313}
   m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs
index 68d5b9d..b930283 100644
--- a/Assets/Scripts/Character.cs
+++ b/Assets/Scripts/Character.cs
@@ -15,6 +15,8 @@ public class Character : MonoBehaviour
 
     public bool inWater = false; //Am I in the water?
     public bool inPit = false; //Did I fall into a pit?
+    public bool onCrystal = false; 
+    public bool underRock = false;
     public bool stuck = false; //Am I still stuck?
     public bool justMoved = false; //Was the logic block I just executed a move command?
     Vector3 death = new Vector3(-50, 0, 0);
@@ -142,7 +144,7 @@ public class Character : MonoBehaviour
 
         StartAnimation(animation, time);
 
-        Debug.Log("Rotating by: " + angles);
+        //Debug.Log("Rotating by: " + angles);
         yield return StartCoroutine(Rotate(direction,angles,  time * 0.8f, yFunction));
 
         StopAnimation(animation);
diff --git a/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs b/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs
index 26bf4ef..2bdda89 100644
--- a/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs
+++ b/Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs
@@ -20,7 +20,7 @@ public class RacetrackGameMode : GameMode
 
     public int RoundCount { get; private set; }
     private Dictionary<ClientData, List<Block>> BlocksOwned;
-
+    int currentBoulderCount;
 
     /// <summary>
     /// Called once before any players have spawned
@@ -193,6 +193,8 @@ public class RacetrackGameMode : GameMode
         //If a character has fallen in the water or into a pit, we mark that fact, and they lose the rest of their turn
         character.inWater = currentBlock.isWater;
         character.inPit = currentBlock.isPit;
+        character.onCrystal = currentBlock.isCrystals;
+        character.underRock = currentBlock.isRock;
 
         if (didMove && (character.inWater || character.inPit))
         {
@@ -203,11 +205,17 @@ public class RacetrackGameMode : GameMode
 
     protected override void OnPlayerKilled(Character character, ClientData client)
     {
-        if (character.inPit)
+        if (character.inPit || character.onCrystal)
+        {
+            character.lives -= 1;
+            character.ClientLink.Lives = character.lives;
+        }
+        if(character.underRock && currentBoulderCount < 1)
         {
             character.lives -= 1;
             character.ClientLink.Lives = character.lives;
         }
+        
     }
 
     private IEnumerator AnimateBlock(Material mat, float time)
@@ -239,7 +247,7 @@ public class RacetrackGameMode : GameMode
 
     public override PlayerData[] getPlayerOrder(PlayerData[] AllPlayers)
     {
-        AllPlayers.OrderByDescending(unit => unit.character.transform.position.x);
+        AllPlayers = AllPlayers.ToArray().OrderBy(unit => unit.character.CurrentBlock.transform.position.x).ToArray();
         return AllPlayers;
     }
 }
diff --git a/Assets/Scripts/LevelBlocks/Block.cs b/Assets/Scripts/LevelBlocks/Block.cs
index 2b51cfa..77469fc 100644
--- a/Assets/Scripts/LevelBlocks/Block.cs
+++ b/Assets/Scripts/LevelBlocks/Block.cs
@@ -24,6 +24,9 @@ public class Block : MonoBehaviour
     [Tooltip("Is this block at the bottom of a pit?")]
     public bool isPit = false;
 
+    public bool isCrystals = false;
+    public bool isRock = false;
+
     [Header("Spawn Settings")]
     [Tooltip("Can this block be spawned on")]
     public bool isSpawnable = false;
diff --git a/Assets/Scripts/Logic/Blocks/Rotate.cs b/Assets/Scripts/Logic/Blocks/Rotate.cs
index 52b2541..edf3d0f 100644
--- a/Assets/Scripts/Logic/Blocks/Rotate.cs
+++ b/Assets/Scripts/Logic/Blocks/Rotate.cs
@@ -31,7 +31,7 @@ public class Rotate : LogicBlock
     {
         //player.Rotate(direction, animationTime);
 
-        Debug.Log("Rotating by: " + Angle);
+        //Debug.Log("Rotating by: " + Angle);
         yield return player.StartCoroutine(player.RotateInDirection(direction,Angle,  Character.Animation.Jump, animationTime));
     }
 
diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs
index 54367be..fd23f60 100644
--- a/Assets/Scripts/Managers/GameManager.cs
+++ b/Assets/Scripts/Managers/GameManager.cs
@@ -34,7 +34,7 @@ public class GameManager : MonoBehaviour
     #endregion Inspector Field
 
     #region Private Variables
-    private Dictionary<int, PlayerData> playerData;
+    public Dictionary<int, PlayerData> playerData;
     private ActiveBlock[] EnvironmentBlocks;
     #endregion Private Variables
 
@@ -104,7 +104,7 @@ public class GameManager : MonoBehaviour
 
             //I hate having to do this
             EnvironmentBlocks = FindObjectsOfType<ActiveBlock>();
-            //Debug.Log("Active blocks found: " + EnvironmentBlocks.Length);
+            ////Debug.Log("Active blocks found: " + EnvironmentBlocks.Length);
 
             //Routine for players movement
             yield return StartCoroutine(RoundRoutine()); //it's pretty long so it gets it's own coroutine;
@@ -126,16 +126,13 @@ public class GameManager : MonoBehaviour
         gameMode.RoundStart(playerDataAsArray);
 
         //playerDataAsArray.OrderByDescending(unit => unit.character.transform.position.x);
-        playerDataAsArray.OrderBy(unit => unit.character.transform.position.x).ToArray();
+        //playerDataAsArray = playerDataAsArray.OrderBy(unit => unit.character.CurrentBlock.transform.position.x).ToArray();
+        playerData = playerData.OrderBy(unit => unit.Value.character.CurrentBlock.transform.position.x).ToDictionary(unit => unit.Key, unit => unit.Value);
 
         //Loop until all players have finished moving
         while (playerDataAsArray.Any(p => !p.blockReader.Finished))
         {
 
-
-            
-
-
             //Loop through all players
             foreach (PlayerData player in playerDataAsArray)
             {
@@ -174,7 +171,7 @@ public class GameManager : MonoBehaviour
         {
             if (player.client.Lives == 0)
             {
-                Debug.Log("Remove: " + player.client.characterAnimal);
+                //Debug.Log("Remove: " + player.client.characterAnimal);
                 removePlayer(player);
             }
         }
@@ -259,7 +256,7 @@ public class GameManager : MonoBehaviour
         int blockIndex = 0;
         foreach (Block block in SpawnBlocks)
         {
-            //Debug.Log("Block #" + blockIndex++ + " (" + block.transform.position.x + ", " + block.transform.position.y + ", " + block.transform.position.z + ")");
+            ////Debug.Log("Block #" + blockIndex++ + " (" + block.transform.position.x + ", " + block.transform.position.y + ", " + block.transform.position.z + ")");
         }
 
         //int spawnIndex = 0;
@@ -271,7 +268,7 @@ public class GameManager : MonoBehaviour
 
         foreach (ClientData client in ClientList)
         {
-            //Debug.Log("spawnIndex = " + spawnIndex);
+            ////Debug.Log("spawnIndex = " + spawnIndex);
             Character newChar = Instantiate(characterPrefab);
             //Block startingBlock = SpawnBlocks[(spawnIndex++ % ClientList.ConnectedClients.Count)];
             Block startingBlock = SpawnBlocks[spawnIndex++];
@@ -344,8 +341,8 @@ public class GameManager : MonoBehaviour
         if (!msg.TryRead(out logicMsg))
             return;
 
-        //Debug that we have recieved it
-        Debug.Log("Recieved function from " + ClientList[msg.conn.connectionId].Name);
+        ////Debug that we have recieved it
+        ////Debug.Log("Recieved function from " + ClientList[msg.conn.connectionId].Name);
 
         //Update player Data with recieved list
         playerData[msg.conn.connectionId].blockReader.LogicChain = new List<LogicBlock>(logicMsg.elements);
diff --git a/Assets/Scripts/Traps/ConveyorBelt.cs b/Assets/Scripts/Traps/ConveyorBelt.cs
index 8257d1a..42812ea 100644
--- a/Assets/Scripts/Traps/ConveyorBelt.cs
+++ b/Assets/Scripts/Traps/ConveyorBelt.cs
@@ -20,11 +20,8 @@ public class ConveyorBelt : ActiveBlock
     {
         if (CurrentPlayer != null)
         {
-            //Debug.Log("currentPlayer: " + CurrentPlayer);
             yield return StartCoroutine(Action.Run(CurrentPlayer, 1,true));
-
         }
-
         isFinished = true;
     }
 }
diff --git a/Assets/Scripts/Traps/CrushingBoulder.cs b/Assets/Scripts/Traps/CrushingBoulder.cs
index 727ec98..4e03ded 100644
--- a/Assets/Scripts/Traps/CrushingBoulder.cs
+++ b/Assets/Scripts/Traps/CrushingBoulder.cs
@@ -27,7 +27,7 @@ public class CrushingBoulder : ActiveBlock
         if (countdown == 0)
         {
             StartCoroutine(FallRaiseCoroutine(-2.0f));
-            yield return new WaitForSeconds(5);
+            yield return new WaitForSeconds(0.5f);
             StartCoroutine(FallRaiseCoroutine(2.0f));
             countdown = countdowntimer;
         }
diff --git a/Assets/Scripts/Traps/CubeWithCrystals.cs b/Assets/Scripts/Traps/CubeWithCrystals.cs
index ac30c38..28ba596 100644
--- a/Assets/Scripts/Traps/CubeWithCrystals.cs
+++ b/Assets/Scripts/Traps/CubeWithCrystals.cs
@@ -14,7 +14,7 @@ public class CubeWithCrystals : ActiveBlock
     public override IEnumerator OnRoundEnd(PlayerData[] allPlayers)
     {
         StartCoroutine(GrowCoroutine());
-        yield return new WaitForSeconds(5);
+        yield return new WaitForSeconds(0.5f);
         StartCoroutine(ShrinkCoroutine());
         isFinished = true;
         //yield break;
diff --git a/Assets/Scripts/UI/Client/LoginUIManager.cs b/Assets/Scripts/UI/Client/LoginUIManager.cs
index c544f3b..89669e1 100644
--- a/Assets/Scripts/UI/Client/LoginUIManager.cs
+++ b/Assets/Scripts/UI/Client/LoginUIManager.cs
@@ -155,7 +155,7 @@ public class LoginUIManager : MonoBehaviour
 
     public void OnClick_Done()
     {
-        if(conn <= maxPlayers)
+        if(conn < maxPlayers)
         {
             if (colorSelected == true && animalSelected == true && playerName != "")
             {
diff --git a/Assets/Scripts/blockSpawn.cs b/Assets/Scripts/blockSpawn.cs
index abb5140..8b71330 100644
--- a/Assets/Scripts/blockSpawn.cs
+++ b/Assets/Scripts/blockSpawn.cs
@@ -109,7 +109,7 @@ public class blockSpawn : MonoBehaviour
         block.GetComponent<LogicCollectable_Multiplayer>().Collectable.element = spawnLogicList[number].element;
         block.GetComponent<LogicCollectable_Multiplayer>().Collectable.Count = spawnLogicList[number].Count;
         block.transform.position = spawnposition;
-        Debug.Log("Instantiated new logic block: " + spawnLogicList[number].element + " at position: " + block.transform.position);
+        //Debug.Log("Instantiated new logic block: " + spawnLogicList[number].element + " at position: " + block.transform.position);
         spawnedLocations.Add(spawnposition);
     }
 }
\ No newline at end of file
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index aeffc55..1c0a9f3 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9684c54f3409168ac466768434a8b3cda25add5043399384e073903491a1a49a
+oid sha256:e48732e471c7fbb8ad8d49bbcc12af26273e0caa803f73b6610358d1793ca05f
 size 2120
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index dddc503..b70056e 100644
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:758221ccdd8ed2b386a3367cc69cc6c5466fe975c0b4a77ac65f68abcdaa7ffd
-size 2428
+oid sha256:06f2c9c42c3e01f1143d4c15cfe4f316cfab490aba17fde694e466c130d4e3a4
+size 2359
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index c19f863..a063595 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45555b93e6e1b3667258c30533eaa4d4888438fda1d1d8df0f3acaa19ed9aebc
-size 19545
+oid sha256:3227dc2661fccc064a73220d2846fe530fb7aafdffe3b10140f080c84310528d
+size 20392