diff --git a/Editor/src/ComponentsPanel/ParticleEmitterPanel.h b/Editor/src/ComponentsPanel/ParticleEmitterPanel.h
index 7ef448a4..04900ec9 100644
--- a/Editor/src/ComponentsPanel/ParticleEmitterPanel.h
+++ b/Editor/src/ComponentsPanel/ParticleEmitterPanel.h
@@ -40,6 +40,15 @@ public:
 				ComponentTableReset(component.Amount, 10.0f);
 			}
 			ImGui::TableNextColumn();
+			{
+				ImGui::Text("Rate");
+				ImGui::TableNextColumn();
+
+				ImGui::DragFloat("##ParticleRate", &component.Rate, 0.1f, 0.0f, 10.0f);
+				ImGui::TableNextColumn();
+				ComponentTableReset(component.Rate, 0.0f);
+			}
+			ImGui::TableNextColumn();
 			{
 				ImGui::Text("Life");
 				ImGui::TableNextColumn();
diff --git a/Editor/src/Misc/GizmoDrawer.cpp b/Editor/src/Misc/GizmoDrawer.cpp
index 51edc163..34747958 100644
--- a/Editor/src/Misc/GizmoDrawer.cpp
+++ b/Editor/src/Misc/GizmoDrawer.cpp
@@ -16,6 +16,7 @@
 #include <src/Scene/Components/CylinderColliderComponent.h>
 #include <src/Scene/Components/MeshCollider.h>
 #include <src/Scene/Components/ModelComponent.h>
+#include <src/Scene/Components/ParticleEmitterComponent.h>
 
 
 GizmoDrawer::GizmoDrawer()
@@ -217,6 +218,18 @@ void GizmoDrawer::DrawGizmos(Ref<Scene> scene)
 		Nuake::RenderCommand::DrawLines(0, 264);
 	}
 
+	auto particleView = scene->m_Registry.view<TransformComponent, ParticleEmitterComponent>();
+	for (auto e : particleView)
+	{
+		auto [transform, particle] = scene->m_Registry.get<TransformComponent, ParticleEmitterComponent>(e);
+		mLineShader->Bind();
+		mLineShader->SetUniformMat4f("u_View", glm::scale(glm::translate(scene->m_EditorCamera->GetTransform(), transform.Translation), Vector3(particle.Radius)));
+		mLineShader->SetUniformMat4f("u_Projection", scene->m_EditorCamera->GetPerspective());
+
+		mCircleBuffer->Bind();
+		Nuake::RenderCommand::DrawLines(0, 128);
+	}
+
 	auto meshColliderView = scene->m_Registry.view<TransformComponent, MeshColliderComponent, ModelComponent>();
 	for (auto e : meshColliderView)
 	{
diff --git a/Nuake/src/Scene/Components/ParticleEmitterComponent.cpp b/Nuake/src/Scene/Components/ParticleEmitterComponent.cpp
index 3c12015c..31cec4af 100644
--- a/Nuake/src/Scene/Components/ParticleEmitterComponent.cpp
+++ b/Nuake/src/Scene/Components/ParticleEmitterComponent.cpp
@@ -8,6 +8,7 @@ namespace Nuake
 		SERIALIZE_VEC4(ParticleColor);
 		SERIALIZE_VAL(Amount);
 		SERIALIZE_VAL(Life);
+		SERIALIZE_VAL(Rate);
 		SERIALIZE_VEC3(Gravity);
 		SERIALIZE_VAL(GravityRandom);
 		SERIALIZE_VAL(Radius);
@@ -20,6 +21,10 @@ namespace Nuake
 		DESERIALIZE_VEC4(j["ParticleColor"], ParticleColor);
 		Amount = j["Amount"];
 		Life = j["Life"];
+		if (j.contains("Rate"))
+		{
+			Rate = j["Rate"];
+		}
 		DESERIALIZE_VEC3(j["Gravity"], Gravity);
 		GravityRandom = j["GravityRandom"];
 		Radius = j["Radius"];
diff --git a/Nuake/src/Scene/Components/ParticleEmitterComponent.h b/Nuake/src/Scene/Components/ParticleEmitterComponent.h
index f7fc44a6..f4081ffa 100644
--- a/Nuake/src/Scene/Components/ParticleEmitterComponent.h
+++ b/Nuake/src/Scene/Components/ParticleEmitterComponent.h
@@ -16,7 +16,8 @@ namespace Nuake
 
 		Color ParticleColor;
 		float Amount;
-		float Life;
+		float Life = 1.0f;
+		float Rate = 0.0f;
 
 		Vector3 Gravity;
 		float GravityRandom;
diff --git a/Nuake/src/Scene/Scene.cpp b/Nuake/src/Scene/Scene.cpp
index b740622e..79e022b8 100644
--- a/Nuake/src/Scene/Scene.cpp
+++ b/Nuake/src/Scene/Scene.cpp
@@ -77,10 +77,10 @@ namespace Nuake {
 
 	Entity Scene::GetEntityByID(int id)
 	{
-		if (m_EntitiesIDMap.find(id) != m_EntitiesIDMap.end())
-		{
-			return m_EntitiesIDMap[id];
-		}
+		//if (m_EntitiesIDMap.find(id) != m_EntitiesIDMap.end())
+		//{
+		//	return m_EntitiesIDMap[id];
+		//}
 
 		auto idView = m_Registry.view<NameComponent>();
 		for (auto e : idView) 
diff --git a/Nuake/src/Scene/Systems/ParticleEmitter.cpp b/Nuake/src/Scene/Systems/ParticleEmitter.cpp
index 5cf21798..2fb47244 100644
--- a/Nuake/src/Scene/Systems/ParticleEmitter.cpp
+++ b/Nuake/src/Scene/Systems/ParticleEmitter.cpp
@@ -5,7 +5,12 @@ namespace Nuake
 	ParticleEmitter::ParticleEmitter()
 	{
 		m_MT = std::mt19937(std::random_device()());
-		m_Random = std::uniform_real_distribution<float>(-Radius, Radius);
+		SetRadius(1.0f);
+	}
+
+	void ParticleEmitter::RecreateRandom()
+	{
+
 	}
 
 	void ParticleEmitter::SpawnParticle()
@@ -16,21 +21,31 @@ namespace Nuake
 			return;
 		}
 
-		const auto initialPosition = Vector3(m_Random(m_MT), m_Random(m_MT), m_Random(m_MT));
-		const auto initialVelocity = Vector3();
-		const auto initialColor = Color(1, 0, 0, 1); // TODO: Use color.
-		const float initialLife = Life;
+		if (Rate == 0.0f || RateTimer > Rate)
+		{
+			const auto initialPosition = Vector3(m_Random(m_MT), m_Random(m_MT), m_Random(m_MT));
+			const auto initialVelocity = Vector3();
+			const auto initialColor = ParticleColor;
+			const float initialLife = Life;
 
-		Particles.push_back({
-			initialPosition,
-			initialVelocity,
-			initialColor,
-			initialLife
-		});
+			Particles.push_back({
+				initialPosition,
+				initialVelocity,
+				initialColor,
+				initialLife
+			});
+
+			RateTimer = 0.0f;
+		}
 	}
 
 	void ParticleEmitter::Update(Timestep ts)
 	{
+		if (Rate != 0.0f)
+		{
+			RateTimer += ts;
+		}
+
 		std::vector<uint32_t> deletionQueue;
 		int i = 0;
 		for (auto& p : Particles)
@@ -60,4 +75,13 @@ namespace Nuake
 			p.Position += p.Velocity * static_cast<float>(ts);
 		}
 	}
+
+	void ParticleEmitter::SetRadius(float radius)
+	{
+		if (Radius != radius)
+		{
+			Radius = radius;
+			m_Random = std::uniform_real_distribution<float>(-Radius, Radius);
+		}
+	}
 }
\ No newline at end of file
diff --git a/Nuake/src/Scene/Systems/ParticleEmitter.h b/Nuake/src/Scene/Systems/ParticleEmitter.h
index 9aa3e0dc..9ed356bf 100644
--- a/Nuake/src/Scene/Systems/ParticleEmitter.h
+++ b/Nuake/src/Scene/Systems/ParticleEmitter.h
@@ -17,11 +17,16 @@ namespace Nuake
 		Vector3 Gravity = Vector3(0, 0, 0);
 		float GravityRandom = 0.0f;
 		float Radius = 1.0f;
+		float Rate = 0.0f;
+		Color ParticleColor;
 
 	private:
+		float RateTimer = 0.0f;
 		std::mt19937 m_MT;
 		std::uniform_real_distribution<float> m_Random;
 
+		void RecreateRandom();
+
 	public:
 		ParticleEmitter();
 		~ParticleEmitter() = default;
@@ -29,6 +34,7 @@ namespace Nuake
 		void SpawnParticle();
 		void Update(Timestep ts);
 
+		void SetRadius(float radius);
 		std::vector<Particle> Particles;
 	};
 }
\ No newline at end of file
diff --git a/Nuake/src/Scene/Systems/ParticleSystem.cpp b/Nuake/src/Scene/Systems/ParticleSystem.cpp
index a730f7a6..aa8d0ac0 100644
--- a/Nuake/src/Scene/Systems/ParticleSystem.cpp
+++ b/Nuake/src/Scene/Systems/ParticleSystem.cpp
@@ -28,10 +28,12 @@ namespace Nuake
 			// Copy emitter settings from component to real emitter
 			auto& emitter = emitterComponent.Emitter;
 			emitter.Amount = emitterComponent.Amount;
+			emitter.ParticleColor = emitterComponent.ParticleColor;
 			emitter.Gravity = emitterComponent.Gravity;
 			emitter.GravityRandom = emitterComponent.GravityRandom;
-			emitter.Radius = emitterComponent.Radius;
+			emitter.SetRadius(emitterComponent.Radius);
 			emitter.Life = emitterComponent.Life;
+			emitter.Rate = emitterComponent.Rate;
 
 			// Spawn particle if possible
 			emitterComponent.Emitter.SpawnParticle();