diff --git a/src/projectzombie/entity/EntityItem.java b/src/projectzombie/entity/EntityItem.java
index 92ebf6a..2106d5f 100755
--- a/src/projectzombie/entity/EntityItem.java
+++ b/src/projectzombie/entity/EntityItem.java
@@ -58,8 +58,8 @@ public class EntityItem extends EntityParticle
 	
 	@Override
 	public double getLightLevel() {
-		if(this.stack.isEmpty()) return 0;
-		return getLightWithHeight(this.stack.item.getLightLevel());
+		if(stack.isEmpty()) return 0;
+		return getLightWithHeight(stack.item.getLightLevel(stack));
 	}
 	
 	@Override
diff --git a/src/projectzombie/entity/player/EntityPlayer.java b/src/projectzombie/entity/player/EntityPlayer.java
index d627466..b9085a8 100755
--- a/src/projectzombie/entity/player/EntityPlayer.java
+++ b/src/projectzombie/entity/player/EntityPlayer.java
@@ -153,7 +153,7 @@ public class EntityPlayer extends Entity implements
 		ItemStack item = inventory.getItem(inventory_hand);
 		
 		if(!item.isEmpty()) {
-			return getLightWithHeight(item.item.getLightLevel());
+			return getLightWithHeight(item.item.getLightLevel(item));
 		}
 		
 		return 0;
diff --git a/src/projectzombie/items/Item.java b/src/projectzombie/items/Item.java
index c9ecb90..d056687 100755
--- a/src/projectzombie/items/Item.java
+++ b/src/projectzombie/items/Item.java
@@ -28,7 +28,7 @@ public abstract class Item
 		return false;
 	}
 	
-	public double getLightLevel() {
+	public double getLightLevel(ItemStack stack) {
 		return 0;
 	}
 	
diff --git a/src/projectzombie/items/ItemLantern.java b/src/projectzombie/items/ItemLantern.java
index e384db6..094f8c8 100755
--- a/src/projectzombie/items/ItemLantern.java
+++ b/src/projectzombie/items/ItemLantern.java
@@ -22,7 +22,7 @@ public class ItemLantern extends Item
 	}
 	
 	@Override
-	public double getLightLevel() {
+	public double getLightLevel(ItemStack stack) {
 		return 1;
 	}
 	
diff --git a/src/projectzombie/items/ItemTorch.java b/src/projectzombie/items/ItemTorch.java
index 16d97ae..6cf7e14 100644
--- a/src/projectzombie/items/ItemTorch.java
+++ b/src/projectzombie/items/ItemTorch.java
@@ -47,7 +47,7 @@ public class ItemTorch extends Item
 		
 		stack.modifiers = new ItemModifier[] {
 				new ItemModifierMeta(1),
-				new ItemModifierTimer(1000),
+				new ItemModifierTimer(12000),
 		};
 		
 		return true;
@@ -66,9 +66,12 @@ public class ItemTorch extends Item
 			return false;
 		}
 		
-		System.out.println(timer.getDamage());
-		
-		return timer.getDamage() <= 0;
+		return timer.getDamage() > 1;
+	}
+	
+	@Override
+	public double getLightLevel(ItemStack stack) {
+		return ItemModifierMeta.getStackMeta(stack) == 1 ? 1 : 0;
 	}
 
 	@Override
diff --git a/src/projectzombie/items/modifier/ItemModifierTimer.java b/src/projectzombie/items/modifier/ItemModifierTimer.java
index 1a242f3..3a03f58 100644
--- a/src/projectzombie/items/modifier/ItemModifierTimer.java
+++ b/src/projectzombie/items/modifier/ItemModifierTimer.java
@@ -11,11 +11,11 @@ public class ItemModifierTimer extends ItemModifier
 	private long start;
 	
 	public long getLeft() {
-		return GameTimer.getTime() - timer;
+		return GameTimer.getTime() - end;
 	}
 	
 	public double getDamage() {
-		return 1 - (double)(timer - GameTimer.getTime()) / (double)timer;
+		return 1 - (double)(end - GameTimer.getTime()) / (double)(end - start);
 	}
 	
 	public ItemModifierTimer(long time) {