diff --git a/src/core/AnimatedVariable.hpp b/src/core/AnimatedVariable.hpp
index 20dd844..3aeda09 100644
--- a/src/core/AnimatedVariable.hpp
+++ b/src/core/AnimatedVariable.hpp
@@ -63,7 +63,7 @@ namespace Hyprtoolkit {
     using CAnimatedVariable = Hyprutils::Animation::CGenericAnimatedVariable<VarType, SAnimationContext>;
 
     template <Animable VarType>
-    using PHLANIMVAR = SP<CAnimatedVariable<VarType>>;
+    using PHLANIMVAR = UP<CAnimatedVariable<VarType>>;
 
     template <Animable VarType>
     using PHLANIMVARREF = WP<CAnimatedVariable<VarType>>;
diff --git a/src/core/AnimationManager.cpp b/src/core/AnimationManager.cpp
index 34132b6..fc7b72b 100644
--- a/src/core/AnimationManager.cpp
+++ b/src/core/AnimationManager.cpp
@@ -86,8 +86,7 @@ static void updateColorVariable(CAnimatedVariable<CHyprColor>& av, const float P
 // }
 
 void CHTAnimationManager::tick() {
-    for (size_t i = 0; i < m_vActiveAnimatedVariables.size(); i++) {
-        const auto PAV = m_vActiveAnimatedVariables[i].lock();
+    for (const auto& PAV : m_vActiveAnimatedVariables) {
         if (!PAV || !PAV->ok())
             continue;
 
diff --git a/src/core/AnimationManager.hpp b/src/core/AnimationManager.hpp
index e21e19c..9aec4cf 100644
--- a/src/core/AnimationManager.hpp
+++ b/src/core/AnimationManager.hpp
@@ -19,12 +19,10 @@ namespace Hyprtoolkit {
         template <Animable VarType>
         void createAnimation(const VarType& v, PHLANIMVAR<VarType>& pav, SP<SAnimationPropertyConfig> pConfig) {
             constexpr const eAnimatedVarType EAVTYPE = typeToeAnimatedVarType<VarType>;
-            const auto                       PAV     = makeShared<CAnimatedVariable<VarType>>();
+            pav                                      = makeUnique<CAnimatedVariable<VarType>>();
 
-            PAV->create(EAVTYPE, static_cast<Hyprutils::Animation::CAnimationManager*>(this), PAV, v);
-            PAV->setConfig(pConfig);
-
-            pav = std::move(PAV);
+            pav->create2(EAVTYPE, static_cast<Hyprutils::Animation::CAnimationManager*>(this), pav, v);
+            pav->setConfig(pConfig);
         }
 
         Hyprutils::Animation::CAnimationConfigTree m_animationTree;