diff --git a/Scenes/Actors/ActorEnemyTest.tscn b/Scenes/Actors/ActorEnemyTest.tscn
index ebaa0892..007b5170 100644
--- a/Scenes/Actors/ActorEnemyTest.tscn
+++ b/Scenes/Actors/ActorEnemyTest.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://Scripts/Components/Actors/Actor.cs" id="1_k5cyk"]
 [ext_resource type="Texture2D" uid="uid://hukxr2e63gky" path="res://Sprites/Actors/Robot3.png" id="2_wt8wl"]
-[ext_resource type="Script" path="res://Scripts/Components/Actors/ActorTankMovement.cs" id="3_738kr"]
+[ext_resource type="Script" path="res://Scripts/Components/Actors/ActorFreeMovement.cs" id="3_4dv5b"]
 [ext_resource type="Script" path="res://Scripts/Components/Actors/KeyboardInputProvider.cs" id="4_8bcq6"]
 [ext_resource type="Script" path="res://Scripts/Components/Actors/AnimationHandler.cs" id="5_c7ovk"]
 
@@ -224,7 +224,7 @@ radius = 5.0
 collision_layer = 16
 collision_mask = 115
 script = ExtResource("1_k5cyk")
-MovementSpeed = 40.0
+MovementSpeed = 30.0
 
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
 position = Vector2(0, 4)
@@ -232,7 +232,7 @@ sprite_frames = SubResource("SpriteFrames_ix17a")
 animation = &"walk_down"
 
 [node name="MovementProvider" type="Node2D" parent="."]
-script = ExtResource("3_738kr")
+script = ExtResource("3_4dv5b")
 
 [node name="InputProvider" type="Node2D" parent="MovementProvider"]
 script = ExtResource("4_8bcq6")
diff --git a/Scripts/Components/Actors/ActorAimingProvider.cs b/Scripts/Components/Actors/ActorAimingProvider.cs
new file mode 100644
index 00000000..0a50cab5
--- /dev/null
+++ b/Scripts/Components/Actors/ActorAimingProvider.cs
@@ -0,0 +1,23 @@
+using Godot;
+
+namespace Cirno.Scripts.Components.Actors;
+
+public abstract partial class ActorAimingProvider : Node2D
+{
+    protected Actor _parent;
+    
+    public abstract Vector2 FacingDirection { get; set; }
+    
+    public virtual void Init(Actor parent)
+    {
+        _parent = parent;
+        
+        var children = GetChildren();
+        foreach (var child in children) {
+            if (child is InputProvider inputProvider) 
+            {
+                //_inputProviders.Add(inputProvider);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Scripts/Components/Actors/ActorFreeMovement.cs b/Scripts/Components/Actors/ActorFreeMovement.cs
index 1a2960e7..1eb1527b 100644
--- a/Scripts/Components/Actors/ActorFreeMovement.cs
+++ b/Scripts/Components/Actors/ActorFreeMovement.cs
@@ -27,7 +27,19 @@ public partial class ActorFreeMovement : MovementHandler
 
     public override void Move(double delta)
     {
-        MovementDirection = AggregateInputProviders();
+        MovementDirection = AggregateInputProviders().Normalized();
+
+        var aimingDirection = GetAimingDirection().Normalized();
+        var isStrafing = GetStrafing();
+
+        if (!isStrafing && aimingDirection.Length() > 0.1f)
+        {
+            FacingDirection = aimingDirection;
+        }
+        else if (MovementDirection != Vector2.Zero)
+        {
+            FacingDirection = MovementDirection;
+        }
         
         _parent.Velocity = MovementDirection * _parent.MovementSpeed;
 
diff --git a/Scripts/Components/Actors/AnimationHandler.cs b/Scripts/Components/Actors/AnimationHandler.cs
index c9a1a347..65ab34cf 100644
--- a/Scripts/Components/Actors/AnimationHandler.cs
+++ b/Scripts/Components/Actors/AnimationHandler.cs
@@ -1,4 +1,5 @@
-using Godot;
+using System.Collections.Generic;
+using Godot;
 
 namespace Cirno.Scripts.Components.Actors;
 
@@ -46,15 +47,39 @@ public partial class AnimationHandler : Node2D
         var angle = Mathf.RadToDeg(direction.Angle());
         angle = Mathf.PosMod(angle, 360);
 
-        if (angle >= 337.5 || angle < 22.5) return "right";
-        if (angle >= 22.5 && angle < 67.5) return "up_right";
-        if (angle >= 67.5 && angle < 112.5) return "up";
-        if (angle >= 112.5 && angle < 157.5) return "up_left";
-        if (angle >= 157.5 && angle < 202.5) return "left";
-        if (angle >= 202.5 && angle < 247.5) return "down_left";
-        if (angle >= 247.5 && angle < 292.5) return "down";
-        if (angle >= 292.5 && angle < 337.5) return "down_right";
+        if (angle >= 337.5 || angle < 22.5) return _directionsTable[FacingDirection.Right];
+        if (angle >= 22.5 && angle < 67.5) return _directionsTable[FacingDirection.DownRight];
+        if (angle >= 67.5 && angle < 112.5) return _directionsTable[FacingDirection.Down];
+        if (angle >= 112.5 && angle < 157.5) return _directionsTable[FacingDirection.DownLeft];
+        if (angle >= 157.5 && angle < 202.5) return _directionsTable[FacingDirection.Left];
+        if (angle >= 202.5 && angle < 247.5) return _directionsTable[FacingDirection.UpLeft];
+        if (angle >= 247.5 && angle < 292.5) return _directionsTable[FacingDirection.Up];
+        if (angle >= 292.5 && angle < 337.5) return _directionsTable[FacingDirection.UpRight];
 
-        return "up";
+        return _directionsTable[FacingDirection.Up];
+    }
+
+    private readonly Dictionary<FacingDirection, string> _directionsTable = new()
+    {
+        { FacingDirection.Right, "right" },
+        { FacingDirection.Left, "left" },
+        { FacingDirection.Up, "up" },
+        { FacingDirection.Down, "down" },
+        { FacingDirection.UpLeft, "up_left" },
+        { FacingDirection.UpRight, "up_right" },
+        { FacingDirection.DownLeft, "down_left" },
+        { FacingDirection.DownRight, "down_right" }
+    };
+
+    private enum FacingDirection
+    {
+        Up,
+        Down,
+        Left,
+        Right,
+        UpRight,
+        UpLeft,
+        DownRight,
+        DownLeft
     }
 }
\ No newline at end of file
diff --git a/Scripts/Components/Actors/InputProvider.cs b/Scripts/Components/Actors/InputProvider.cs
index 896154a9..e6dd9151 100644
--- a/Scripts/Components/Actors/InputProvider.cs
+++ b/Scripts/Components/Actors/InputProvider.cs
@@ -5,4 +5,7 @@ namespace Cirno.Scripts.Components.Actors;
 public abstract partial class InputProvider : Node2D
 {
     public abstract Vector2 GetMovementInput();
+    public abstract Vector2 GetAimInput();
+
+    public abstract bool GetStrafing();
 }
\ No newline at end of file
diff --git a/Scripts/Components/Actors/KeyboardInputProvider.cs b/Scripts/Components/Actors/KeyboardInputProvider.cs
index 2e6a22c7..d643c493 100644
--- a/Scripts/Components/Actors/KeyboardInputProvider.cs
+++ b/Scripts/Components/Actors/KeyboardInputProvider.cs
@@ -8,4 +8,24 @@ public partial class KeyboardInputProvider : InputProvider
     {
         return Input.GetVector("left", "right", "up", "down");
     }
+
+    public override Vector2 GetAimInput()
+    {
+        var rightStickInput = GetRightStickInput();
+
+        return GetRightStickInput();
+    }
+    
+    private Vector2 GetRightStickInput()
+    {
+        return new Vector2(
+            Input.GetAxis("aim_left","aim_right"), 
+            Input.GetAxis("aim_up", "aim_down")
+        );
+    }
+
+    public override bool GetStrafing()
+    {
+        return Input.IsActionPressed("strafe");
+    }
 }
\ No newline at end of file
diff --git a/Scripts/Components/Actors/MovementHandler.cs b/Scripts/Components/Actors/MovementHandler.cs
index d27c36fa..265c4289 100644
--- a/Scripts/Components/Actors/MovementHandler.cs
+++ b/Scripts/Components/Actors/MovementHandler.cs
@@ -28,7 +28,17 @@ public abstract partial class MovementHandler : Node2D
 
     public virtual Vector2 AggregateInputProviders()
     {
-        return _inputProviders.Aggregate(Vector2.Zero, (current, inputProvider) => current + inputProvider.GetMovementInput().Normalized());
+        return _inputProviders.Aggregate(Vector2.Zero, (current, inputProvider) => current + inputProvider.GetMovementInput());
+    }
+    
+    public virtual Vector2 GetAimingDirection()
+    {
+        return _inputProviders.Aggregate(Vector2.Zero, (current, inputProvider) => current + inputProvider.GetAimInput());
+    }
+
+    public virtual bool GetStrafing()
+    {
+        return _inputProviders.Aggregate(false, (current, inputProvider) => current && inputProvider.GetStrafing());
     }
 
     public abstract void Move(double delta);