diff --git a/Assets/Materials/CutScene/CutScene_04a.shmat b/Assets/Materials/CutScene/CutScene_04a.shmat
index 799b5eb9..e7ae15e3 100644
--- a/Assets/Materials/CutScene/CutScene_04a.shmat
+++ b/Assets/Materials/CutScene/CutScene_04a.shmat
@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 51238312
+    data.textureIndex: 59076169
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}
\ No newline at end of file
diff --git a/Assets/Materials/CutScene/CutScene_04b.shmat b/Assets/Materials/CutScene/CutScene_04b.shmat
index c01d8434..65e9c12b 100644
--- a/Assets/Materials/CutScene/CutScene_04b.shmat
+++ b/Assets/Materials/CutScene/CutScene_04b.shmat
@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 61471971
+    data.textureIndex: 66572525
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}
\ No newline at end of file
diff --git a/Assets/Materials/CutScene/CutScene_04c.shmat b/Assets/Materials/CutScene/CutScene_04c.shmat
index ffe9aab1..d2d4872c 100644
--- a/Assets/Materials/CutScene/CutScene_04c.shmat
+++ b/Assets/Materials/CutScene/CutScene_04c.shmat
@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 58217538
+    data.textureIndex: 66182834
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}
\ No newline at end of file
diff --git a/Assets/Materials/CutScene/CutScene_05a.shmat b/Assets/Materials/CutScene/CutScene_05a.shmat
index c1436c21..4c93cd65 100644
--- a/Assets/Materials/CutScene/CutScene_05a.shmat
+++ b/Assets/Materials/CutScene/CutScene_05a.shmat
@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 61980534
+    data.textureIndex: 58009216
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}
\ No newline at end of file
diff --git a/Assets/Materials/CutScene/CutScene_05b.shmat b/Assets/Materials/CutScene/CutScene_05b.shmat
index 82a612d8..5096f916 100644
--- a/Assets/Materials/CutScene/CutScene_05b.shmat
+++ b/Assets/Materials/CutScene/CutScene_05b.shmat
@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 51561286
+    data.textureIndex: 55022275
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}
\ No newline at end of file
diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade
index dfd29855..b6a5ecd1 100644
--- a/Assets/Scenes/Level1.shade
+++ b/Assets/Scenes/Level1.shade
@@ -7180,7 +7180,7 @@
 - EID: 228
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: -7.47360849, y: 1.4327563, z: -2.44241929}
@@ -7217,6 +7217,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 215
   Name: CollisionWall
   IsActive: true
@@ -7240,10 +7241,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 576
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 225
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: 1.97487497, y: 1.3500793, z: -10.195508}
@@ -7280,6 +7311,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 214
   Name: CollisionWall
   IsActive: true
@@ -7303,10 +7335,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 575
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 224
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: -5.47656107, y: 1.4327563, z: -2.44241929}
@@ -7343,6 +7405,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 213
   Name: CollisionWall
   IsActive: true
@@ -7366,10 +7429,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 572
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 223
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: 6.09239721, y: 1.4327563, z: -6.03106117}
@@ -7406,6 +7499,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 212
   Name: CollisionWall
   IsActive: true
@@ -7429,10 +7523,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 571
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 222
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: 6.09239721, y: 1.4327563, z: -3.94262314}
@@ -7469,6 +7593,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 211
   Name: CollisionWall
   IsActive: true
@@ -7492,6 +7617,36 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 570
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 198
   Name: ====Raccoon====
   IsActive: true
@@ -8359,4 +8514,100 @@
       soundDistance: 10
       highlightSpeed: 200
       highlightThickness: 60
-      highlightLowerClamp: 0.25
\ No newline at end of file
+      highlightLowerClamp: 0.25
+- EID: 66150
+  Name: ParticlesDeco
+  IsActive: true
+  NumberOfChildren: 3
+  Components: ~
+  Scripts: ~
+- EID: 613
+  Name: Water particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 1.93323815, y: 1.15519547, z: -0.353647888}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 0
+      Min Life: 0.100000001
+      Max Life: 0.100000001
+      Minimum Speed: 0
+      Maximum Speed: 0
+      Minimum Size: 0.0500000007
+      Maximum Size: 0.100000001
+      Size Decay: 1
+      Angular Ranges And Offset: {x: 0, y: -1.50999999, z: 0, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: -0.899999976, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 615
+  Name: Water particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 1.92703927, y: 0.649912179, z: -0.349291772}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 0
+      Min Life: 0.100000001
+      Max Life: 0.100000001
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.0199999996
+      Maximum Size: 0.0199999996
+      Size Decay: 1
+      Angular Ranges And Offset: {x: 6.11999989, y: 0, z: 6.11999989, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: 0.100000001, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 66147
+  Name: Water particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -5.35778379, y: 1.15327418, z: -9.67887211}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 1.5
+      Min Life: 0.300000012
+      Max Life: 0.300000012
+      Minimum Speed: 0
+      Maximum Speed: 0
+      Minimum Size: 0.0500000007
+      Maximum Size: 0.100000001
+      Size Decay: 0.980000019
+      Angular Ranges And Offset: {x: 0, y: -1.50999999, z: 0, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: -0.100000001, z: 0}
+      IsActive: true
+  Scripts: ~
\ No newline at end of file
diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade
index 90a04fb5..d259ec5a 100644
--- a/Assets/Scenes/Level2.shade
+++ b/Assets/Scenes/Level2.shade
@@ -18,7 +18,7 @@
       Position: {x: 0, y: 0, z: 0}
       Type: Directional
       Direction: {x: 15, y: -90, z: 15}
-      Color: {x: 1, y: 1, z: 1, w: 1}
+      Color: {x: 0.881057262, y: 0.735790312, z: 0.32214871, w: 1}
       Layer: 4294967295
       Strength: 1
       Casting Shadows: false
@@ -53,7 +53,7 @@
       Position: {x: 2, y: 1.5, z: -5.5999999}
       Type: Directional
       Direction: {x: -0.0780000016, y: 0.159999996, z: -1}
-      Color: {x: 0, y: 0, z: 0, w: 1}
+      Color: {x: 0.845814943, y: 0.612846136, z: 0.208659217, w: 1}
       Layer: 4294967295
       Strength: 1
       Casting Shadows: true
@@ -2740,7 +2740,7 @@
 - EID: 13
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: 2.24178481, y: 1.4327563, z: 9.46397972}
@@ -2777,6 +2777,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 18
   Name: CollisionWall
   IsActive: true
@@ -2800,10 +2801,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 576
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 14
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: -0.5, y: 1.5, z: -5}
@@ -2840,6 +2871,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 17
   Name: CollisionWall
   IsActive: true
@@ -2863,6 +2895,36 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 579
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 238
   Name: ====GameManager====
   IsActive: true
@@ -2945,6 +3007,7 @@
   Scripts:
     - Type: PlayerController
       Enabled: true
+      smokeCount: 4
       respawnPoint: 239
       currentState: 0
       walkMaxMoveVel: 2.5
@@ -5544,7 +5607,7 @@
   Components:
     Transform Component:
       Translate: {x: 0, y: -300, z: 0}
-      Rotate: {x: -1.48352981, y: 2.82014489, z: 0.5}
+      Rotate: {x: 0.5, y: 0.5, z: 0.5}
       Scale: {x: 400, y: 100, z: 500}
       IsActive: true
     Renderable Component:
@@ -5630,7 +5693,7 @@
 - EID: 19
   Name: ====EnvironmentMaster====
   IsActive: true
-  NumberOfChildren: 30
+  NumberOfChildren: 33
   Components:
     Transform Component:
       Translate: {x: 0, y: 0, z: 0}
@@ -14739,6 +14802,204 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 570
+  Name: CeilingFan
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -3.43279505, y: 3.04381442, z: 0.590506613}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 135521751
+      Material: 131956078
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
+      IsActive: true
+  Scripts:
+    - Type: CeilingFan
+      Enabled: true
+      rotateSpeed: 3
+- EID: 571
+  Name: CeilingFan
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -0.0900869966, y: 3.04381442, z: -2.56089497}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 135521751
+      Material: 131956078
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
+      IsActive: true
+  Scripts:
+    - Type: CeilingFan
+      Enabled: true
+      rotateSpeed: 3
+- EID: 572
+  Name: CeilingFan
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 2.14731741, y: 3.04381442, z: 3.51156116}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 135521751
+      Material: 131956078
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
+      IsActive: true
+  Scripts:
+    - Type: CeilingFan
+      Enabled: true
+      rotateSpeed: 3
 - EID: 548
   Name: TweenManager
   IsActive: true
@@ -15085,201 +15346,99 @@
       Clicked: false
       IsActive: true
   Scripts: ~
-- EID: 570
-  Name: CeilingFan
+- EID: 66150
+  Name: ParticlesDeco
+  IsActive: true
+  NumberOfChildren: 3
+  Components: ~
+  Scripts: ~
+- EID: 613
+  Name: Water particles
   IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -3.43279505, y: 3.04381442, z: 0.590506613}
+      Translate: {x: 1.49184668, y: 1.40755236, z: -4.72096539}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
-    Renderable Component:
-      Mesh: 135521751
-      Material: 131956078
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 0
+      Min Life: 0.100000001
+      Max Life: 0.100000001
+      Minimum Speed: 0
+      Maximum Speed: 0
+      Minimum Size: 0.0500000007
+      Maximum Size: 0.100000001
+      Size Decay: 1
+      Angular Ranges And Offset: {x: 0, y: -1.50999999, z: 0, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: -0.899999976, z: 0}
       IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: CeilingFan
-      Enabled: true
-      rotateSpeed: 3
-- EID: 571
-  Name: CeilingFan
+  Scripts: ~
+- EID: 615
+  Name: Water particles
   IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -0.0900869966, y: 3.04381442, z: -2.56089497}
+      Translate: {x: 1.50063443, y: 0.889689028, z: -4.72193813}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
-    Renderable Component:
-      Mesh: 135521751
-      Material: 131956078
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 0
+      Min Life: 0.100000001
+      Max Life: 0.100000001
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.0199999996
+      Maximum Size: 0.0199999996
+      Size Decay: 1
+      Angular Ranges And Offset: {x: 6.11999989, y: 0, z: 6.11999989, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: 0.100000001, z: 0}
       IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: CeilingFan
-      Enabled: true
-      rotateSpeed: 3
-- EID: 572
-  Name: CeilingFan
+  Scripts: ~
+- EID: 66147
+  Name: Water particles
   IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 2.14731741, y: 3.04381442, z: 3.51156116}
+      Translate: {x: 2.49271369, y: 1.43694282, z: -4.72096539}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
-    Renderable Component:
-      Mesh: 135521751
-      Material: 131956078
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 1.5
+      Min Life: 0.300000012
+      Max Life: 0.300000012
+      Minimum Speed: 0
+      Maximum Speed: 0
+      Minimum Size: 0.0500000007
+      Maximum Size: 0.100000001
+      Size Decay: 0.980000019
+      Angular Ranges And Offset: {x: 0, y: -1.50999999, z: 0, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: -0.100000001, z: 0}
       IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: CeilingFan
-      Enabled: true
-      rotateSpeed: 3
\ No newline at end of file
+  Scripts: ~
\ No newline at end of file
diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade
index 70d69a38..1068276e 100644
--- a/Assets/Scenes/Level3.shade
+++ b/Assets/Scenes/Level3.shade
@@ -1,16 +1,21 @@
 - EID: 0
   Name: Light_Direction
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
+    Transform Component:
+      Translate: {x: -4.64838362, y: 2.94342947, z: 0.209690213}
+      Rotate: {x: 4.70589209, y: 2.37206268, z: 7.50559092}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
     Light Component:
       Position: {x: 0, y: 0, z: 0}
       Type: Directional
-      Direction: {x: 8.30000019, y: -10.1999998, z: 20}
-      Color: {x: 1, y: 1, z: 1, w: 1}
+      Direction: {x: 1, y: 0.790000021, z: 3.60299993}
+      Color: {x: 0.122785211, y: 0.161672071, z: 0.753303945, w: 1}
       Layer: 4294967295
       Strength: 1
-      Casting Shadows: false
+      Casting Shadows: true
       IsActive: true
   Scripts: ~
 - EID: 36
@@ -28,10 +33,30 @@
       Casting Shadows: false
       IsActive: true
   Scripts: ~
+- EID: 626
+  Name: Light_Directional
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Light Component:
+      Position: {x: 0, y: 0, z: 0}
+      Type: Directional
+      Direction: {x: 15, y: -90, z: 15}
+      Color: {x: 0.224145621, y: 0.285699487, z: 0.660792947, w: 1}
+      Layer: 4294967295
+      Strength: 1
+      Casting Shadows: false
+      IsActive: true
+  Scripts: ~
 - EID: 449
   Name: Enviroment
   IsActive: true
-  NumberOfChildren: 15
+  NumberOfChildren: 26
   Components: ~
   Scripts: ~
 - EID: 78
@@ -5646,7 +5671,7 @@
     Transform Component:
       Translate: {x: 0, y: 0, z: 0}
       Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 18.7835312, y: 18.7835312, z: 18.7835312}
+      Scale: {x: 18.7835312, y: 18.7835312, z: 17.7490005}
       IsActive: true
     Renderable Component:
       Mesh: 144340823
@@ -8438,6 +8463,251 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 607
+  Name: Ceiling2
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 5.30615234, y: 5.38999987, z: 2.31740665}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 10, y: 10, z: 10}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142686872
+      Material: 126223465
+      IsActive: true
+  Scripts: ~
+- EID: 616
+  Name: cushionCollider
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0.561188579, y: 0.722451508, z: 7.24862099}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.200000003, y: 0.5, z: 0.649999976}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0.261799395}
+      IsActive: true
+  Scripts: ~
+- EID: 617
+  Name: cushionCollider
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0.561188579, y: 0.722451508, z: 7.98083258}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.200000003, y: 0.5, z: 0.649999976}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0.261799395}
+      IsActive: true
+  Scripts: ~
+- EID: 618
+  Name: cushionCollider
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -0.44977349, y: 2.94509721, z: 0.998321831}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.200000003, y: 0.5, z: 0.649999976}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0.261799395}
+      IsActive: true
+  Scripts: ~
+- EID: 619
+  Name: cushionCollider
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -0.44977349, y: 2.94509721, z: 1.74675691}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.200000003, y: 0.5, z: 0.649999976}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0.261799395}
+      IsActive: true
+  Scripts: ~
+- EID: 620
+  Name: cushionCollider
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 2.73146415, y: 0.722451508, z: 5.79716682}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.649999976, y: 0.5, z: 0.200000003}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: -0.261799395, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 621
+  Name: cushionCollider
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 3.49046326, y: 0.722451508, z: 5.79716682}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.649999976, y: 0.5, z: 0.200000003}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: -0.261799395, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 622
+  Name: cushionCollider
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 2.47354746, y: 2.95288348, z: -0.689723432}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.649999976, y: 0.5, z: 0.200000003}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: -0.261799395, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 623
+  Name: cushionCollider
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 1.75696623, y: 2.95288348, z: -0.689723432}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.649999976, y: 0.5, z: 0.200000003}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: -0.261799395, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 624
+  Name: cushionCollider
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 1.75696623, y: 2.95288348, z: 3.43151593}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.649999976, y: 0.5, z: 0.200000003}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0.261799395, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 625
+  Name: cushionCollider
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 2.4944241, y: 2.95288348, z: 3.43151593}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.649999976, y: 0.5, z: 0.200000003}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0.261799395, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 553
   Name: TweenManager
   IsActive: true
@@ -8850,7 +9120,7 @@
 - EID: 522
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: -1.54310393, y: 1.44638538, z: 7.98654604}
@@ -8887,6 +9157,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 518
   Name: CollisionWall
   IsActive: true
@@ -8910,10 +9181,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 603
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 517
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: -1.29031229, y: 1.42268324, z: 1.50382555}
@@ -8950,6 +9251,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 516
   Name: CollisionWall
   IsActive: true
@@ -8973,10 +9275,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 604
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 131620
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: 10.9849348, y: 3.6516223, z: -1.48581266}
@@ -9013,6 +9345,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 66051
   Name: CollisionWall
   IsActive: true
@@ -9036,6 +9369,36 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 605
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 554
   Name: CameraPoints
   IsActive: true
@@ -12741,9 +13104,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -1.78079093, y: -0.150818765, z: 0.483723372}
+      Translate: {x: 0.0993275642, y: 0.00163418055, z: 0.00153395347}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1.00025964, y: 1, z: 1.00025964}
+      Scale: {x: 1.00048888, y: 1, z: 1.00048888}
       IsActive: true
     Renderable Component:
       Mesh: 150010583
@@ -14885,4 +15248,250 @@
       Hovered: false
       Clicked: false
       IsActive: true
+  Scripts: ~
+- EID: 66150
+  Name: ParticlesDeco
+  IsActive: true
+  NumberOfChildren: 8
+  Components: ~
+  Scripts: ~
+- EID: 606
+  Name: Light particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 4.116467, y: 1.89355922, z: 4.89108658}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 2.29999995
+      Min Life: 0.300000012
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.100000001
+      Maximum Size: 0.200000003
+      Size Decay: 0.959999979
+      Angular Ranges And Offset: {x: 6.19999981, y: 0, z: 6.19999981, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.832599103, y: 0.757529616, z: 0.0916959345, w: 1}
+      Acceleration: {x: 0, y: -0.100000001, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 608
+  Name: Light particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 4.30909538, y: 1.8720628, z: 5.92373705}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 3.20000005
+      Min Life: 0.300000012
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.100000001
+      Maximum Size: 0.200000003
+      Size Decay: 0.959999979
+      Angular Ranges And Offset: {x: 6.19999981, y: 0, z: 6.19999981, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.832599103, y: 0.757529616, z: 0.0916959345, w: 1}
+      Acceleration: {x: 0, y: -0.100000001, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 609
+  Name: Light particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 4.20589209, y: 1.8720628, z: 7.00559092}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 2.5
+      Min Life: 0.300000012
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.100000001
+      Maximum Size: 0.200000003
+      Size Decay: 0.959999979
+      Angular Ranges And Offset: {x: 6.19999981, y: 0, z: 6.19999981, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.832599103, y: 0.757529616, z: 0.0916959345, w: 1}
+      Acceleration: {x: 0, y: -0.100000001, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 610
+  Name: Light particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 4.41353178, y: 1.8720628, z: 9.03471375}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 3.29999995
+      Min Life: 0.300000012
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.100000001
+      Maximum Size: 0.200000003
+      Size Decay: 0.959999979
+      Angular Ranges And Offset: {x: 6.19999981, y: 0, z: 6.19999981, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.832599103, y: 0.757529616, z: 0.0916959345, w: 1}
+      Acceleration: {x: 0, y: -0.100000001, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 611
+  Name: Water particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 2.49841309, y: 1.11244416, z: -0.787879944}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 2
+      Min Life: 0.300000012
+      Max Life: 0.300000012
+      Minimum Speed: 0
+      Maximum Speed: 0
+      Minimum Size: 0.0500000007
+      Maximum Size: 0.100000001
+      Size Decay: 0.980000019
+      Angular Ranges And Offset: {x: 0, y: -1.50999999, z: 0, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: -0.100000001, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 612
+  Name: Light particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 4.116467, y: 1.89355922, z: 4.89108658}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 2.29999995
+      Min Life: 0.300000012
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.100000001
+      Maximum Size: 0.200000003
+      Size Decay: 0.959999979
+      Angular Ranges And Offset: {x: 6.19999981, y: 0, z: 6.19999981, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.832599103, y: 0.757529616, z: 0.0916959345, w: 1}
+      Acceleration: {x: 0, y: -0.100000001, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 613
+  Name: Water particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 1.49607766, y: 1.11244416, z: -0.783726573}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 0
+      Min Life: 0.100000001
+      Max Life: 0.100000001
+      Minimum Speed: 0
+      Maximum Speed: 0
+      Minimum Size: 0.0500000007
+      Maximum Size: 0.100000001
+      Size Decay: 1
+      Angular Ranges And Offset: {x: 0, y: -1.50999999, z: 0, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: -0.899999976, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 615
+  Name: Water particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 1.50316513, y: 0.708620548, z: -0.793335676}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 0
+      Min Life: 0.100000001
+      Max Life: 0.100000001
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.0199999996
+      Maximum Size: 0.0199999996
+      Size Decay: 1
+      Angular Ranges And Offset: {x: 6.11999989, y: 0, z: 6.11999989, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: 0.100000001, z: 0}
+      IsActive: true
   Scripts: ~
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/Item/SC_Item.cs b/Assets/Scripts/Gameplay/Item/SC_Item.cs
index 185dbe83..494fc464 100644
--- a/Assets/Scripts/Gameplay/Item/SC_Item.cs
+++ b/Assets/Scripts/Gameplay/Item/SC_Item.cs
@@ -19,6 +19,7 @@ public class Item : Script
   private bool playSound = false;
   private bool caputurePos = false;
   private Vector3 firstPostion;
+  private Vector3 firstRotation;
   private Collider collider;
   public float density = 1.0f;
   public bool dontReturn = false;
@@ -101,7 +102,7 @@ public class Item : Script
 
       if (transform)
       {
-        transform.LocalEulerAngles = Vector3.Zero;
+        transform.LocalEulerAngles = firstRotation;
         transform.LocalPosition = firstPostion;
       }
 
@@ -129,6 +130,7 @@ public class Item : Script
     if (!caputurePos)
     {
       firstPostion = transform.LocalPosition;
+      firstRotation = transform.LocalEulerAngles;
       caputurePos = true;
     }
 
diff --git a/Assets/Scripts/Gameplay/SC_ScoringZone.cs b/Assets/Scripts/Gameplay/SC_ScoringZone.cs
index 874ca0c7..7acf6948 100644
--- a/Assets/Scripts/Gameplay/SC_ScoringZone.cs
+++ b/Assets/Scripts/Gameplay/SC_ScoringZone.cs
@@ -4,7 +4,17 @@ using System;
 public class ScoringZone : Script
 {
 
+  private ParticleEmitter particle;
+  public int startingParticleCount = 10;
+
   protected override void awake()
+  {
+    particle = GetComponentInChildren<ParticleEmitter>();
+    if (!particle)
+      Debug.LogError("PARTICLE MISSING");
+  }
+
+  protected override void update()
   {
   }
 
@@ -14,6 +24,8 @@ public class ScoringZone : Script
     {
       GameManager.Instance.Score += info.GameObject.GetScript<Item>().Score * GameManager.Instance.currMultiplierCombo;
       GameManager.Instance.ItemScored();
+      particle.EmissionCount = startingParticleCount * GameManager.Instance.currMultiplierCombo;
+      particle.Emit();
       info.GameObject.SetActive(false);
     }
   }
diff --git a/Assets/Shaders/ParticleEmit_CS.glsl b/Assets/Shaders/ParticleEmit_CS.glsl
index 96ad1ef4..7b6e60be 100644
--- a/Assets/Shaders/ParticleEmit_CS.glsl
+++ b/Assets/Shaders/ParticleEmit_CS.glsl
@@ -131,7 +131,7 @@ void main()
   ParticleData particle;
 
   // Get seed for randomization
-  uint pixel_index = uint (emitterPosition.x + emitterPosition.y + floatBitsToUint(genericDataBuffer.data.elapsedTime) * (gl_GlobalInvocationID.x + 1));
+  uint pixel_index = uint (emitterPosition.x * emitterPosition.y + floatBitsToUint(genericDataBuffer.data.elapsedTime) * (gl_GlobalInvocationID.x + 1));
   uint seed = pcg_hash (pixel_index);
 
   int index = freelist.freeIndices[freelistIndex];
diff --git a/Assets/Shaders/ParticleEmit_CS.shshaderb b/Assets/Shaders/ParticleEmit_CS.shshaderb
index fb928683..f0e7b191 100644
Binary files a/Assets/Shaders/ParticleEmit_CS.shshaderb and b/Assets/Shaders/ParticleEmit_CS.shshaderb differ
diff --git a/Assets/Shaders/ParticleUpdateRandomColor_CS.glsl b/Assets/Shaders/ParticleUpdateRandomColor_CS.glsl
new file mode 100644
index 00000000..91c17eb5
--- /dev/null
+++ b/Assets/Shaders/ParticleUpdateRandomColor_CS.glsl
@@ -0,0 +1,163 @@
+#version 450
+
+layout(local_size_x = 128) in;
+
+struct DrawArraysIndirectArgs
+{
+  uint count;
+  uint instanceCount;
+  uint first;
+  uint baseInstance;
+};
+
+struct ParticleData
+{
+  vec4 position;
+  vec4 orientationSpeedDecay;
+  vec4 velocity;
+  vec4 acceleration;
+  vec4 scaleAndDecay;
+  vec4 colorTint;
+  float life;
+  uint textureIndex;
+};
+
+struct GenericData
+{
+  //! Delta time
+  float dt;
+
+  //! Elapsed time of the application
+  float elapsedTime;
+
+  //! Viewport width of the scene (excluding imgui, that means smaller than window)
+  uint viewportWidth;
+
+  //! Ditto but for height
+  uint viewportHeight;
+};
+
+layout(set = 1, binding = 0) uniform CameraData
+{
+  vec4 position; 
+  mat4 vpMat;
+  mat4 viewMat;
+  mat4 projMat;
+} cameraData;
+
+
+layout (set = 0, binding = 0) uniform GenericDataBuffer
+{
+  GenericData data;
+} genericDataBuffer;
+
+layout (std430, set = 2, binding = 1) coherent restrict readonly buffer ParticlesInputBuffer
+{
+  ParticleData data[];
+} inputParticles;
+
+// output buffer not needed
+layout (std430, set = 2, binding = 2) coherent restrict buffer ParticlesOutputBuffer
+{
+  ParticleData data[];
+} outputParticles;
+
+layout (std430, set = 2, binding = 3) coherent restrict buffer ParticlesFreelistBuffer
+{
+  int freeCount;
+  int freeIndices[];
+
+} freelist;
+
+layout (std430, set = 2, binding = 4) coherent restrict buffer IndicesData
+{
+  uint indices[];
+};
+
+layout (std140, set = 2, binding = 5) coherent restrict buffer IndirectDrawArgs
+{
+  DrawArraysIndirectArgs indirectArgs;
+}; 
+
+// push constants
+layout(std140, push_constant) uniform EmitterPushConstant
+{
+  vec4 emitterPosition;
+  uint emissionCount;
+
+} emitterPushConstant;
+
+uint pcg_hash(uint seed)
+{
+  uint state = seed * 747796405u + 2891336453u;
+  uint word = ((state >> ((state >> 28u) + 4u)) ^ state) * 277803737u;
+  return (word >> 22u) ^ word;
+}
+
+// Used to advance the PCG state.
+uint rand_pcg(inout uint rng_state)
+{
+  uint state = rng_state;
+  rng_state = rng_state * 747796405u + 2891336453u;
+  uint word = ((state >> ((state >> 28u) + 4u)) ^ state) * 277803737u;
+  return (word >> 22u) ^ word;
+}
+
+// Advances the prng state and returns the corresponding random float.
+float rand(inout uint state)
+{
+  uint x = rand_pcg(state);
+  state = x;
+  return float(x)*uintBitsToFloat(0x2f800004u);
+}
+
+void main()
+{ 
+  uint index = gl_GlobalInvocationID.x;
+
+  ParticleData particle = inputParticles.data[index];
+
+    // Get seed for randomization
+  uint pixel_index = uint (particle.velocity.x + particle.velocity.y + floatBitsToUint(genericDataBuffer.data.elapsedTime) * (gl_GlobalInvocationID.x + 1));
+  uint seed = pcg_hash (pixel_index);
+
+
+  if (particle.life > 0.0f)
+  {
+    // update position from velocity
+    particle.position += particle.velocity * genericDataBuffer.data.dt;
+    particle.velocity += particle.acceleration;
+    particle.life -= genericDataBuffer.data.dt;
+    particle.orientationSpeedDecay.x += particle.orientationSpeedDecay.y;
+    particle.scaleAndDecay.x *= particle.scaleAndDecay.z;
+    particle.scaleAndDecay.y *= particle.scaleAndDecay.w;
+
+    if (particle.colorTint.xyz == vec3(0.0f))
+    {
+      particle.colorTint.xyz = vec3 (rand (seed), rand(seed), rand(seed));
+    }
+
+    if (particle.orientationSpeedDecay.y > 0.0f)
+    {
+      particle.orientationSpeedDecay.y -= particle.orientationSpeedDecay.z * genericDataBuffer.data.dt;
+      if (particle.orientationSpeedDecay.y < 0.0f)
+        particle.orientationSpeedDecay.y = 0.0f;
+    }  
+    
+    if (particle.life < 0.0f || particle.scaleAndDecay.x < 0.0f || particle.scaleAndDecay.y < 0.0f)
+    {
+      particle.life = 0.0f;
+      particle.position.x = 9999.0f;
+      
+      outputParticles.data[index] = particle;
+      freelist.freeIndices[atomicAdd(freelist.freeCount, 1)] = int (index);
+      return;
+    }
+
+    uint drawIndex = atomicAdd (indirectArgs.instanceCount, 1);
+    indices[drawIndex] = index;
+
+  }
+
+  outputParticles.data[index] = particle;
+}
\ No newline at end of file
diff --git a/Assets/Shaders/ParticleUpdateRandomColor_CS.shshaderb b/Assets/Shaders/ParticleUpdateRandomColor_CS.shshaderb
new file mode 100644
index 00000000..b6326ae4
Binary files /dev/null and b/Assets/Shaders/ParticleUpdateRandomColor_CS.shshaderb differ
diff --git a/Assets/Shaders/ParticleUpdateRandomColor_CS.shshaderb.shmeta b/Assets/Shaders/ParticleUpdateRandomColor_CS.shshaderb.shmeta
new file mode 100644
index 00000000..5516e2be
--- /dev/null
+++ b/Assets/Shaders/ParticleUpdateRandomColor_CS.shshaderb.shmeta
@@ -0,0 +1,3 @@
+Name: ParticleUpdateRandomColor_CS
+ID: 37407233
+Type: 2
diff --git a/Assets/Texture/Cutscene/TX_cutscene_04a.dds b/Assets/Texture/Cutscene/TX_cutscene_04a.dds
index 68162863..921778b9 100644
Binary files a/Assets/Texture/Cutscene/TX_cutscene_04a.dds and b/Assets/Texture/Cutscene/TX_cutscene_04a.dds differ
diff --git a/Assets/Texture/Cutscene/TX_cutscene_04a.shtex b/Assets/Texture/Cutscene/TX_cutscene_04a.shtex
index ac8bef3a..6445ed04 100644
Binary files a/Assets/Texture/Cutscene/TX_cutscene_04a.shtex and b/Assets/Texture/Cutscene/TX_cutscene_04a.shtex differ
diff --git a/Assets/Texture/Cutscene/TX_cutscene_04a.shtex.shmeta b/Assets/Texture/Cutscene/TX_cutscene_04a.shtex.shmeta
index fab6ad23..554e90b9 100644
--- a/Assets/Texture/Cutscene/TX_cutscene_04a.shtex.shmeta
+++ b/Assets/Texture/Cutscene/TX_cutscene_04a.shtex.shmeta
@@ -1,3 +1,3 @@
 Name: TX_cutscene_04a
-ID: 51238312
+ID: 59076169
 Type: 3
diff --git a/Assets/Texture/Cutscene/TX_cutscene_04b.dds b/Assets/Texture/Cutscene/TX_cutscene_04b.dds
index d7103725..2b1700bc 100644
Binary files a/Assets/Texture/Cutscene/TX_cutscene_04b.dds and b/Assets/Texture/Cutscene/TX_cutscene_04b.dds differ
diff --git a/Assets/Texture/Cutscene/TX_cutscene_04b.shtex b/Assets/Texture/Cutscene/TX_cutscene_04b.shtex
index 785cef62..323637fe 100644
Binary files a/Assets/Texture/Cutscene/TX_cutscene_04b.shtex and b/Assets/Texture/Cutscene/TX_cutscene_04b.shtex differ
diff --git a/Assets/Texture/Cutscene/TX_cutscene_04b.shtex.shmeta b/Assets/Texture/Cutscene/TX_cutscene_04b.shtex.shmeta
index 5fd13580..c06a1ff1 100644
--- a/Assets/Texture/Cutscene/TX_cutscene_04b.shtex.shmeta
+++ b/Assets/Texture/Cutscene/TX_cutscene_04b.shtex.shmeta
@@ -1,3 +1,3 @@
 Name: TX_cutscene_04b
-ID: 61471971
+ID: 66572525
 Type: 3
diff --git a/Assets/Texture/Cutscene/TX_cutscene_04c.dds b/Assets/Texture/Cutscene/TX_cutscene_04c.dds
index 547e4068..7c93ea20 100644
Binary files a/Assets/Texture/Cutscene/TX_cutscene_04c.dds and b/Assets/Texture/Cutscene/TX_cutscene_04c.dds differ
diff --git a/Assets/Texture/Cutscene/TX_cutscene_04c.shtex b/Assets/Texture/Cutscene/TX_cutscene_04c.shtex
index 29bd5c3f..4208ac9a 100644
Binary files a/Assets/Texture/Cutscene/TX_cutscene_04c.shtex and b/Assets/Texture/Cutscene/TX_cutscene_04c.shtex differ
diff --git a/Assets/Texture/Cutscene/TX_cutscene_04c.shtex.shmeta b/Assets/Texture/Cutscene/TX_cutscene_04c.shtex.shmeta
index 3d8601d7..a546fe4a 100644
--- a/Assets/Texture/Cutscene/TX_cutscene_04c.shtex.shmeta
+++ b/Assets/Texture/Cutscene/TX_cutscene_04c.shtex.shmeta
@@ -1,3 +1,3 @@
 Name: TX_cutscene_04c
-ID: 58217538
+ID: 66182834
 Type: 3
diff --git a/Assets/Texture/Cutscene/TX_cutscene_05a.dds b/Assets/Texture/Cutscene/TX_cutscene_05a.dds
index ed5a2401..504da29b 100644
Binary files a/Assets/Texture/Cutscene/TX_cutscene_05a.dds and b/Assets/Texture/Cutscene/TX_cutscene_05a.dds differ
diff --git a/Assets/Texture/Cutscene/TX_cutscene_05a.shtex b/Assets/Texture/Cutscene/TX_cutscene_05a.shtex
index f456f871..f751aff3 100644
Binary files a/Assets/Texture/Cutscene/TX_cutscene_05a.shtex and b/Assets/Texture/Cutscene/TX_cutscene_05a.shtex differ
diff --git a/Assets/Texture/Cutscene/TX_cutscene_05a.shtex.shmeta b/Assets/Texture/Cutscene/TX_cutscene_05a.shtex.shmeta
index 0e4aa2b0..e54f1587 100644
--- a/Assets/Texture/Cutscene/TX_cutscene_05a.shtex.shmeta
+++ b/Assets/Texture/Cutscene/TX_cutscene_05a.shtex.shmeta
@@ -1,3 +1,3 @@
 Name: TX_cutscene_05a
-ID: 61980534
+ID: 58009216
 Type: 3
diff --git a/Assets/Texture/Cutscene/TX_cutscene_05b.dds b/Assets/Texture/Cutscene/TX_cutscene_05b.dds
index 0cee98cc..8fa9e601 100644
Binary files a/Assets/Texture/Cutscene/TX_cutscene_05b.dds and b/Assets/Texture/Cutscene/TX_cutscene_05b.dds differ
diff --git a/Assets/Texture/Cutscene/TX_cutscene_05b.shtex b/Assets/Texture/Cutscene/TX_cutscene_05b.shtex
index 5aa8c2a5..54bca5b9 100644
Binary files a/Assets/Texture/Cutscene/TX_cutscene_05b.shtex and b/Assets/Texture/Cutscene/TX_cutscene_05b.shtex differ
diff --git a/Assets/Texture/Cutscene/TX_cutscene_05b.shtex.shmeta b/Assets/Texture/Cutscene/TX_cutscene_05b.shtex.shmeta
index 6bb021a7..a45b86e4 100644
--- a/Assets/Texture/Cutscene/TX_cutscene_05b.shtex.shmeta
+++ b/Assets/Texture/Cutscene/TX_cutscene_05b.shtex.shmeta
@@ -1,3 +1,3 @@
 Name: TX_cutscene_05b
-ID: 51561286
+ID: 55022275
 Type: 3
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
index c1938f60..48e71f57 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
@@ -147,7 +147,7 @@ namespace SHADE
     //SHAssetManager::CompileAsset("../../Assets/Shaders/Anim_VS.glsl", false);
     //SHAssetManager::CompileAsset("../../Assets/Shaders/Particle_VS.glsl", false);
     //SHAssetManager::CompileAsset("../../Assets/Shaders/Particle_FS.glsl", false);
-    //SHAssetManager::CompileAsset("../../Assets/Shaders/ParticleEmit_CS.glsl", false);
+    SHAssetManager::CompileAsset("../../Assets/Shaders/ParticleEmit_CS.glsl", false);
     //SHAssetManager::CompileAsset("../../Assets/Shaders/ParticleUpdate_CS.glsl", false);
 
     // Load Built In Shaders
diff --git a/SHADE_Engine/src/Navigation/SHNavigationSystem.cpp b/SHADE_Engine/src/Navigation/SHNavigationSystem.cpp
index 1d7d6612..d8ea3d32 100644
--- a/SHADE_Engine/src/Navigation/SHNavigationSystem.cpp
+++ b/SHADE_Engine/src/Navigation/SHNavigationSystem.cpp
@@ -14,8 +14,8 @@
 #include <map>
 #include <list>
 
-#define DRAW_NAVIGATION_DATA
-#define DRAW_NAVIGATION_PATH
+//#define DRAW_NAVIGATION_DATA
+//#define DRAW_NAVIGATION_PATH
 
 
 namespace SHADE