diff --git a/scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py b/scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py
index 0d6b44b4..b10205e1 100644
--- a/scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py
+++ b/scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py
@@ -11,5 +11,6 @@ def setup(core, object):
 	object.setStringAttribute('condition', '1000/1000')
 	object.setStringAttribute("@obj_attr_n:color", "Windu's Guile")
 	object.setAttachment('radial_filename', 'item/tunable')
+	object.setStringAttribute('@obj_attr_n:crystal_owner", "\\#D1F56F UNTUNED \\#FFFFFF ')
 	return
 	
\ No newline at end of file
diff --git a/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_lava_crystal.py b/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_lava_crystal.py
index ccad8904..94ca341b 100644
--- a/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_lava_crystal.py
+++ b/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_lava_crystal.py
@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	object.setStringAttribute('condition', '100/100')
+	object.setStringAttribute('@obj_attr_n:color', 'Lava')
+	object.setAttachment('radial_filename', 'item/tunable')
+	return
+	
\ No newline at end of file
diff --git a/src/services/DevService.java b/src/services/DevService.java
index 4b9bb46e..3700a3da 100644
--- a/src/services/DevService.java
+++ b/src/services/DevService.java
@@ -1057,10 +1057,6 @@ public class DevService implements INetworkDispatch {
 						inventory.add(colorCrystal);
 						
 						TangibleObject lavaCrystal = (TangibleObject) core.objectService.createObject("object/tangible/component/weapon/lightsaber/shared_lightsaber_module_lava_crystal.iff", planet);
-						lavaCrystal.getAttributes().put("@obj_attr_n:condition", "100/100");
-						lavaCrystal.getAttributes().put("@obj_attr_n:crystal_owner", "\\#D1F56F UNTUNED \\#FFFFFF ");
-						lavaCrystal.getAttributes().put("@obj_attr_n:color", "Lava"); 
-						lavaCrystal.setAttachment("radial_filename", "item/tunable");		
 						inventory.add(lavaCrystal);
 						
 						return;
@@ -1334,6 +1330,7 @@ public class DevService implements INetworkDispatch {
 						inventory.add(REingTool);	
 						core.lootService.prepInv2(player);
 						return;
+
 				}
 			}	
 		});