diff --git a/d3hog_driver.php b/d3hog_driver.php
index 8e01e67..01a30de 100644
--- a/d3hog_driver.php
+++ b/d3hog_driver.php
@@ -6,6 +6,7 @@ include_once(__DIR__ . '/libs/dpclass.php');
 
 if($_POST['submit']) {
   $diabloProgressUrl = trim($_POST['url']);
+  $elementalOnWeapon = isset($_POST['elemental']['elemental']) ? true : false;
   if(preg_match('{^http://www.diabloprogress.com/hero/[\w]+\-[\d]+/[\w]+/[\d]+$}', $diabloProgressUrl) != 1) {
     die('Bad URL.  Please enter the entire diablo progress URL.<br/><br/>Example: http://www.diabloprogress.com/hero/celanian-1548/HsuMing/21706367');
   }
@@ -18,7 +19,7 @@ if($_POST['submit']) {
   $contents = curl_exec($curl);
   curl_close($curl);
 
-  $character = DPClassFactory::createClassObject($contents);
+  $character = DPClassFactory::createClassObject($contents, $elementalOnWeapon);
 
   if($character === FALSE) {
     die('Bad class.  Either your class could not be detected or we do not support your class at this time.');
@@ -38,5 +39,6 @@ Paragon Score: <?php echo number_format($character->paragonScore(), 2, '.', ',')
 ?>
 <form method="POST">
   D3 Progress URL: <input type="text" name="url" style="width:500px;" value="<?php echo $diabloProgressUrl ?>" /><br />
+  Elemental Damage on Weapon: <input type="checkbox" name="elemental" value="elemental" <?php echo $elementalOnWeapon ? 'checked="checked"' : '' ?> /><br/>
   <input type="submit" name="submit" />
 </form>
\ No newline at end of file
diff --git a/libs/dpclass.php b/libs/dpclass.php
index a8208af..8e084f5 100644
--- a/libs/dpclass.php
+++ b/libs/dpclass.php
@@ -1,16 +1,16 @@
 <?php
 
 class DPClassFactory {
-  function createClassObject($characterPage) {
+  function createClassObject($characterPage, $elementalOnWeapon) {
     $class = DPClassFactory::findClass($characterPage);
 
     include_once(__DIR__ . "/$class.php");
 
     switch($class) {
       case 'barbarian':
-        return new Barbarian($characterPage);
+        return new Barbarian($characterPage, $elementalOnWeapon);
       case 'wizard':
-        return new Wizard($characterPage);
+        return new Wizard($characterPage, $elementalOnWeapon);
       default:
         return false;
     }
@@ -30,10 +30,11 @@ class DPClass {
   var $stats = array();
   var $items = array();
 
-  function __construct($characterPage) {
+  function __construct($characterPage, $elementalOnWeapon) {
     $this->dpHTML = $characterPage;
 
     $this->class = get_class($this);
+    $this->elementalOnWeapon = $elementalOnWeapon;
 
     $this->parseStats();
   }
@@ -61,14 +62,18 @@ class DPClass {
   }
 
   function elementalDamage() {
-    $totalElemental = 0;
+    $totalElemental = 1;
     foreach($this->stats as $stat => $value) {
       if(preg_match('/\+DPS \(.*\)/', $stat) > 0) {
         $totalElemental += $value;
       }
     }
 
-    return ($totalElemental > 0) ? $totalElemental + 1 : 0;
+    if($this->elementalOnWeapon && $totalElemental != 1) {
+      $totalElemental *= .5;
+    }
+
+    return ($totalElemental > 0) ? $totalElemental : 0;
   }
 
   function calculateGemLife() {
@@ -93,7 +98,7 @@ class DPClass {
 
   function modifyDPSUnbuffed() {
     $this->stats['DPS Unbuffed'] = $this->getStat('DPS Unbuffed') * 
-      max(1, 1 + ($this->getStat('All Elemental Damage') / 2)) * 
+      $this->getStat('All Elemental Damage') * 
       max(1, 1 + ($this->getStat('+DPS Against Elites') / 2));
   }