diff --git a/RSND/Core/Database.cs b/RSND/Core/Database.cs
index 9ac6126..fefcd27 100644
--- a/RSND/Core/Database.cs
+++ b/RSND/Core/Database.cs
@@ -83,13 +83,14 @@ public class Database
         var table = query?.TableName;
         var key = query?.Key;
         var value = query?.Value;
+        var newValue = query?.NewValue;
         
         var tableToReturn = _tables.Find(x => x.Name == table);
-        var row = tableToReturn?.Rows?.FirstOrDefault(x => x.Columns?.FirstOrDefault(y => y.Name == key)?.Name == key);
+        var row = tableToReturn?.Rows?.FirstOrDefault(x => x.Columns?.FirstOrDefault(y => y.Name == key)?.Value == value);
         var column = row?.Columns?.FirstOrDefault(x => x.Name == key);
         
         if (column != null)
-            column.Value = value;
+            column.Value = newValue;
         
         Save();
     }
diff --git a/RSND/Core/Querying/Queries/SetQuery.cs b/RSND/Core/Querying/Queries/SetQuery.cs
index 50f053b..dad3b92 100644
--- a/RSND/Core/Querying/Queries/SetQuery.cs
+++ b/RSND/Core/Querying/Queries/SetQuery.cs
@@ -5,4 +5,5 @@ public class SetQuery : Query
     public string TableName { get; set; }
     public string Key { get; set; }
     public string Value { get; set; }
+    public string NewValue { get; set; }
 }
\ No newline at end of file