diff --git a/scripts/CSharp/Common/Farming/FarmingControls2D.cs b/scripts/CSharp/Common/Farming/FarmingControls2D.cs
index 0031f5b..10014e5 100644
--- a/scripts/CSharp/Common/Farming/FarmingControls2D.cs
+++ b/scripts/CSharp/Common/Farming/FarmingControls2D.cs
@@ -19,7 +19,6 @@ public partial class FarmingControls2D : Node2D
     private int _toolId = -1;
     private bool _wateringCanFilled = false;
     
-    [Signal] public delegate void FieldCreatedEventHandler();
     
     #region Tools
     
@@ -50,18 +49,7 @@ public partial class FarmingControls2D : Node2D
     }
     
     #endregion
-
-    public override void _Input(InputEvent @event)
-    {
-        if (@event.IsActionPressed("click"))
-        {
-            if ( _toolId == 0)
-            {
-                Vector2I adjustedPosition = GetAdjustedMousePosition();
-                MakeField(adjustedPosition);
-            }
-        }
-    }
+    
 
     private Vector2I GetAdjustedMousePosition()
     {
@@ -87,13 +75,4 @@ public partial class FarmingControls2D : Node2D
 
     #endregion
     
-    #region FIELD CREATION
-    private void MakeField(Vector2I mousePosition)
-    {
-        int potentialFieldIndex = FieldService.Instance.PositionToIndex(mousePosition);
-        if(FieldService.Instance.TryGet(_sceneKeyProvider.Payload.AsString(), potentialFieldIndex) == null)
-            EmitSignal(SignalName.FieldCreated);
-    }
-    
-    #endregion
 }
\ No newline at end of file
diff --git a/scripts/CSharp/Common/Farming/FieldActivator.cs b/scripts/CSharp/Common/Farming/FieldActivator.cs
index 926098f..f324176 100644
--- a/scripts/CSharp/Common/Farming/FieldActivator.cs
+++ b/scripts/CSharp/Common/Farming/FieldActivator.cs
@@ -13,6 +13,8 @@ public partial class FieldActivator : Node
 
     private bool _used = false;
     private bool _rakeInHand;
+    
+    [Signal] public delegate void FieldCreatedEventHandler();
 
     public override void _Ready()
     {
@@ -28,6 +30,7 @@ public partial class FieldActivator : Node
         {
             _field.Visible = true;
             _field.UpdateFieldState(FieldState.Tilled);
+            EmitSignal(SignalName.FieldCreated, _field);
             _used = true;
         }
     }
diff --git a/scripts/CSharp/Common/Farming/FieldService.cs b/scripts/CSharp/Common/Farming/FieldService.cs
index a280d34..197e7c9 100644
--- a/scripts/CSharp/Common/Farming/FieldService.cs
+++ b/scripts/CSharp/Common/Farming/FieldService.cs
@@ -85,12 +85,6 @@ public partial class FieldService : Node
             }
         }
     }
-
-    public int PositionToIndex(Vector2 position)
-    {
-        // some awesome code here
-        return 0;
-    }
 }
 
 internal class FieldsInScene