diff --git a/src/main/java/emu/lunarcore/command/CommandArgs.java b/src/main/java/emu/lunarcore/command/CommandArgs.java
index d311354..e221cba 100644
--- a/src/main/java/emu/lunarcore/command/CommandArgs.java
+++ b/src/main/java/emu/lunarcore/command/CommandArgs.java
@@ -94,13 +94,7 @@ public class CommandArgs {
      */
     public boolean setProperties(GameAvatar avatar) {
         boolean hasChanged = false;
-        
-        // Try to set level
-        if (this.getLevel() > 0) {
-            avatar.setLevel(this.getLevel());
-            hasChanged = true;
-        }
-        
+
         // Try to set level
         if (this.getLevel() > 0) {
             avatar.setLevel(Math.min(this.getLevel(), 80));
diff --git a/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java b/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java
index be29b96..7c42c42 100644
--- a/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java
+++ b/src/main/java/emu/lunarcore/command/commands/GiveAllCommand.java
@@ -96,12 +96,12 @@ public class GiveAllCommand implements CommandHandler {
                         }
                         
                         // Add avatar
-                        target.getInventory().addItem(excel, 1);
-                        
-                        // Set avatar properties
-                        GameAvatar avatar = target.getAvatarById(excel.getId());
-                        if (avatar != null) {
-                            args.setProperties(avatar);
+                        var avatarExcel = GameData.getAvatarExcelMap().get(excel.getId());
+                        if (avatarExcel != null) {
+                            GameAvatar avatar = new GameAvatar(avatarExcel);
+                            args.setProperties(avatar); // Set avatar properties
+                            
+                            target.getAvatars().addAvatar(avatar);
                         }
                     } else if (excel.getItemSubType() == ItemSubType.Eidolon) {
                         // Add eidolons