diff --git a/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.cpp b/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.cpp
index 17bf6fa5..d6ef8d19 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.cpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.cpp
@@ -13,6 +13,7 @@
 #include <Editor/IconsFontAwesome6.h>
 
 #include "Camera/SHCameraSystem.h"
+#include "FRC/SHFramerateController.h"
 
 constexpr std::string_view windowName = "\xef\x80\x95 Viewport";
 
@@ -27,15 +28,20 @@ namespace SHADE
   {
     SHEditorWindow::Init();
     transformGizmo.Init();
-    auto camSystem = SHSystemManager::GetSystem<SHCameraSystem>();
-    camSystem->UpdateEditorCamera(0.016f);
   }
 
   void SHEditorViewport::Update()
   {
     SHEditorWindow::Update();
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f,0.0f));
-    if(Begin())
+    if (shouldUpdateCamera)
+    {
+      auto camSystem = SHSystemManager::GetSystem<SHCameraSystem>();
+      camSystem->UpdateEditorCamera(SHFrameRateController::GetRawDeltaTime());
+      shouldUpdateCamera = false;
+    }
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
+
+    if (Begin())
     {
       ImGuizmo::SetDrawlist();
       DrawMenuBar();
@@ -43,39 +49,38 @@ namespace SHADE
       auto const& descriptorSet = gfxSystem->GetPostOffscreenRenderSystem()->GetDescriptorSetGroup()->GetVkHandle()[0];
       auto mousePos = ImGui::GetMousePos();
       beginCursorPos = ImGui::GetCursorScreenPos();
-      viewportMousePos = {mousePos.x - beginCursorPos.x, mousePos.y - beginCursorPos.y};
-      gfxSystem->GetMousePickSystem ()->SetViewportMousePos (viewportMousePos);
+      viewportMousePos = { mousePos.x - beginCursorPos.x, mousePos.y - beginCursorPos.y };
+      gfxSystem->GetMousePickSystem()->SetViewportMousePos(viewportMousePos);
 
-      ImGui::Image((ImTextureID)descriptorSet, {beginContentRegionAvailable.x, beginContentRegionAvailable.y});
+      ImGui::Image((ImTextureID)descriptorSet, { beginContentRegionAvailable.x, beginContentRegionAvailable.y });
 
-      if(ImGui::IsWindowHovered() && ImGui::IsMouseDown(ImGuiMouseButton_Right))
+      if (ImGui::IsWindowHovered() && ImGui::IsMouseDown(ImGuiMouseButton_Right))
       {
         ImGui::SetMouseCursor(ImGuiMouseCursor_None);
         ImGui::SetCursorScreenPos(ImGui::GetMousePos());
         ImGui::PushStyleColor(ImGuiCol_Text, ImGuiColors::green);
         ImGui::Text(ICON_FA_EYE);
         ImGui::PopStyleColor();
-
-        auto camSystem = SHSystemManager::GetSystem<SHCameraSystem>();
-        camSystem->UpdateEditorCamera(0.016f);
+        
+        shouldUpdateCamera = true;
       }
-      if(ImGui::IsWindowFocused() && !ImGui::IsMouseDown(ImGuiMouseButton_Right))
+      if (ImGui::IsWindowFocused() && !ImGui::IsMouseDown(ImGuiMouseButton_Right))
       {
-        if(ImGui::IsKeyReleased(ImGuiKey_Q))
+        if (ImGui::IsKeyReleased(ImGuiKey_Q))
         {
           transformGizmo.operation = SHTransformGizmo::Operation::TRANSLATE;
         }
-        if(ImGui::IsKeyReleased(ImGuiKey_W))
+        if (ImGui::IsKeyReleased(ImGuiKey_W))
         {
           transformGizmo.operation = SHTransformGizmo::Operation::ROTATE;
         }
-        if(ImGui::IsKeyReleased(ImGuiKey_E))
+        if (ImGui::IsKeyReleased(ImGuiKey_E))
         {
           transformGizmo.operation = SHTransformGizmo::Operation::SCALE;
         }
       }
     }
-    ImGuizmo::SetRect(beginCursorPos.x , beginCursorPos.y, beginContentRegionAvailable.x, beginContentRegionAvailable.y);
+    ImGuizmo::SetRect(beginCursorPos.x, beginCursorPos.y, beginContentRegionAvailable.x, beginContentRegionAvailable.y);
     transformGizmo.Draw();
     ImGui::End();
     ImGui::PopStyleVar();
@@ -94,13 +99,12 @@ namespace SHADE
 
     //auto pos = ImGui::GetCursorPos();
     //windowCursorPos = {}
-    if(beginContentRegionAvailable.x == 0 || beginContentRegionAvailable.y == 0)
+    if (beginContentRegionAvailable.x == 0 || beginContentRegionAvailable.y == 0)
     {
-      beginContentRegionAvailable =  windowSize;
+      beginContentRegionAvailable = windowSize;
     }
     gfxSystem->PrepareResize(static_cast<uint32_t>(beginContentRegionAvailable.x), static_cast<uint32_t>(beginContentRegionAvailable.y));
-    auto camSystem = SHSystemManager::GetSystem<SHCameraSystem>();
-    camSystem->UpdateEditorCamera(0.016f);
+    shouldUpdateCamera = true;
   }
 
   void SHEditorViewport::OnPosChange()
@@ -110,61 +114,61 @@ namespace SHADE
 
   void SHEditorViewport::DrawMenuBar() noexcept
   {
-    if(ImGui::BeginMenuBar())
+    if (ImGui::BeginMenuBar())
     {
       ImGui::BeginDisabled(ImGui::IsWindowFocused() && ImGui::IsMouseDown(ImGuiMouseButton_Right));
       bool const isTranslate = transformGizmo.operation == SHTransformGizmo::Operation::TRANSLATE;
       ImGui::BeginDisabled(isTranslate);
-      if(isTranslate)
+      if (isTranslate)
         ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyle().Colors[ImGuiCol_CheckMark]);
-      if(ImGui::Button(ICON_MD_OPEN_WITH))
+      if (ImGui::Button(ICON_MD_OPEN_WITH))
       {
         transformGizmo.operation = SHTransformGizmo::Operation::TRANSLATE;
       }
       ImGui::EndDisabled();
-      if(ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled))
+      if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled))
       {
         ImGui::BeginTooltip();
         ImGui::Text("Translate [Q]");
         ImGui::EndTooltip();
       }
-      if(isTranslate)
+      if (isTranslate)
         ImGui::PopStyleColor();
 
       bool const isRotate = transformGizmo.operation == SHTransformGizmo::Operation::ROTATE;
       ImGui::BeginDisabled(isRotate);
-      if(isRotate)
+      if (isRotate)
         ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyle().Colors[ImGuiCol_CheckMark]);
-      if(ImGui::Button(ICON_MD_AUTORENEW))
+      if (ImGui::Button(ICON_MD_AUTORENEW))
       {
         transformGizmo.operation = SHTransformGizmo::Operation::ROTATE;
       }
       ImGui::EndDisabled();
-      if(ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled))
+      if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled))
       {
         ImGui::BeginTooltip();
         ImGui::Text("Rotate [W]");
         ImGui::EndTooltip();
       }
-      if(isRotate)
+      if (isRotate)
         ImGui::PopStyleColor();
 
       bool const isScale = transformGizmo.operation == SHTransformGizmo::Operation::SCALE;
       ImGui::BeginDisabled(isScale);
-      if(isScale)
+      if (isScale)
         ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyle().Colors[ImGuiCol_CheckMark]);
-      if(ImGui::Button(ICON_MD_EXPAND))
+      if (ImGui::Button(ICON_MD_EXPAND))
       {
         transformGizmo.operation = SHTransformGizmo::Operation::SCALE;
       }
       ImGui::EndDisabled();
-      if(ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled))
+      if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled))
       {
         ImGui::BeginTooltip();
         ImGui::Text("Scale [E]");
         ImGui::EndTooltip();
       }
-      if(isScale)
+      if (isScale)
         ImGui::PopStyleColor();
       ImGui::EndDisabled();
       ImGui::EndMenuBar();
diff --git a/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.h b/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.h
index 80b13285..0fae4317 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.h
+++ b/SHADE_Engine/src/Editor/EditorWindow/ViewportWindow/SHEditorViewport.h
@@ -14,7 +14,7 @@
 
 namespace SHADE
 {
-    class SHEditorViewport final : public SHEditorWindow
+  class SHEditorViewport final : public SHEditorWindow
   {
   public:
     SHEditorViewport();
@@ -28,5 +28,6 @@ namespace SHADE
   private:
     void DrawMenuBar() noexcept;
     SHVec2 beginCursorPos;
+    bool shouldUpdateCamera = false;
   };//class SHEditorViewport
 }//namespace SHADE