diff --git a/modules/pegasus-actor-sheet.js b/modules/pegasus-actor-sheet.js
index e7b77e5..c6ba6a3 100644
--- a/modules/pegasus-actor-sheet.js
+++ b/modules/pegasus-actor-sheet.js
@@ -200,7 +200,7 @@ export class PegasusActorSheet extends ActorSheet {
     
     html.find('.update-field').change(ev => {
       const fieldName = $(ev.currentTarget).data("field-name");
-      let value = ev.currentTarget.value;
+      let value = Number(ev.currentTarget.value);
       this.actor.update( { [`${fieldName}`]: value } );
     });    
     html.find('.perk-active').click(ev => {
diff --git a/modules/pegasus-actor.js b/modules/pegasus-actor.js
index a73d0bf..331d675 100644
--- a/modules/pegasus-actor.js
+++ b/modules/pegasus-actor.js
@@ -821,12 +821,14 @@ export class PegasusActor extends Actor {
       rollData.img = weapon.img
       rollData.weapon = weapon
       rollData.title = `Weapon : ${weapon.name}`
-      rollData.stat = this.getStat(weapon.data.statistic)
       rollData.specList = this.getRelevantSpec(weapon.data.statistic)
       rollData.activePerks = duplicate(this.getActivePerks())
       if (damage) {
+        rollData.stat = this.getStat(weapon.data.damagestatistic)        
         rollData.isDamage = true;
         rollData.otherDicesLevel = weapon.data.damage
+      } else {
+        rollData.stat = this.getStat(weapon.data.statistic)
       }
 
       //this.updateWithTarget(rollData);
diff --git a/packs/melee-weapons.db b/packs/melee-weapons.db
index 3036f13..579ca46 100644
--- a/packs/melee-weapons.db
+++ b/packs/melee-weapons.db
@@ -1,29 +1,29 @@
-{"_id":"144rfjnzFYrmYic8","name":"Mace","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"3","cost":50,"weight":5,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"2wX3rgrklWArMS51","name":"Axe","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"2","cost":50,"weight":4,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"7oEmLpgYnkBBaE7X","name":"Short Sword","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"2","cost":400,"weight":2,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"8QgryKTwlap3SCc3","name":"Club","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"2","cost":5,"weight":3,"idr":"1","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"9p4F1tDJ9IcScu3W","name":"Morning Star","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"3","cost":80,"weight":6,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"AtuSTcpEdBG8zysz","name":"Spear","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"2","cost":40,"weight":4,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":2,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"Gig1UePFdvI7lpEs","name":"Maul","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"4","cost":80,"weight":12,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"Hs0czWEnLGi0365m","name":"Baton","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"2","cost":20,"weight":1,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"HxbLVr9GeOLbxpyp","name":"Katana","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"3","cost":650,"weight":5,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"J43upUgAFqPW8rWK","name":"Battle-Axe","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"3","cost":60,"weight":6,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"K1RrlMKU5ngbD1VU","name":"Sword","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"3","cost":300,"weight":3,"idr":"4","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"MQUhX1H4uqnDII8a","name":"Black Jack/Sap","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"2","cost":20,"weight":1,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"QMt3xX7NnVmmccpQ","name":"Javelin","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"2","cost":30,"weight":2,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"UrmkBY1zywg22bQo","name":"Rapier","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"2","cost":500,"weight":3,"idr":"1","range":"notapplicable","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":3,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"VROcXYSuOuSOKk5o","name":"Warhammer","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"3","cost":100,"weight":7,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"VjZeKoAjAil3zCP1","name":"Lance","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"4","cost":75,"weight":5,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":2,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"ZgaKoQwsFx9horJW","name":"Knife/Dagger","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"1","cost":35,"weight":1,"idr":"2","range":"close","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"bCh6cquZdyqTBF48","name":"Nunchucks","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"2","cost":20,"weight":2,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"e0fYGBlTIA61v4Ju","name":"Energy Sword","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"7","cost":8000,"weight":2,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":2,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"fdErkTBx3aNMqRK9","name":"Halberd","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"5","cost":150,"weight":12,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"iQ0Y4Wz9VbyprlsK","name":"Bastard Sword","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"3","cost":650,"weight":5,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"iuaBa0BKY3cokhhy","name":"Brass Knuckles","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"1","cost":10,"weight":0.25,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"lhSUtg50SilX5JzJ","name":"Whip","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"1","cost":20,"weight":2,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"none","damagetypelevel":0,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"nb8ViPJh9CoQiwTn","name":"Chainsaw","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"4","cost":150,"weight":13,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"or9NvRF2U34fnJFd","name":"Flail","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"3","cost":100,"weight":8,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"qHTESL1bzq1KwqGd","name":"Poleaxe","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"4","cost":120,"weight":10,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"sKrsxqe1KdQ3YrTy","name":"Quarterstaff","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"2","cost":10,"weight":4,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"zWIEpl30e2Hq3vJe","name":"Great Sword","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"4","cost":800,"weight":7,"idr":"4","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"zk3pxHsNhWEn6HSC","name":"Great Axe","type":"weapon","img":"worlds/gmd-develop/icons/MeleeWeapons.png","data":{"statistic":"str","damage":"4","cost":100,"weight":8,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"144rfjnzFYrmYic8","name":"Mace","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"3","cost":50,"weight":5,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"2wX3rgrklWArMS51","name":"Axe","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"2","cost":50,"weight":4,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"7oEmLpgYnkBBaE7X","name":"Short Sword","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"2","cost":400,"weight":2,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"8QgryKTwlap3SCc3","name":"Club","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"2","cost":5,"weight":3,"idr":"1","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"9p4F1tDJ9IcScu3W","name":"Morning Star","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"3","cost":80,"weight":6,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"AtuSTcpEdBG8zysz","name":"Spear","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"2","cost":40,"weight":4,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":2,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"Gig1UePFdvI7lpEs","name":"Maul","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"4","cost":80,"weight":12,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"Hs0czWEnLGi0365m","name":"Baton","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"2","cost":20,"weight":1,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"HxbLVr9GeOLbxpyp","name":"Katana","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"3","cost":650,"weight":5,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"J43upUgAFqPW8rWK","name":"Battle-Axe","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"3","cost":60,"weight":6,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"K1RrlMKU5ngbD1VU","name":"Sword","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"3","cost":300,"weight":3,"idr":"4","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"MQUhX1H4uqnDII8a","name":"Black Jack/Sap","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"2","cost":20,"weight":1,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"QMt3xX7NnVmmccpQ","name":"Javelin","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"2","cost":30,"weight":2,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"UrmkBY1zywg22bQo","name":"Rapier","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"2","cost":500,"weight":3,"idr":"1","range":"notapplicable","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":3,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"VROcXYSuOuSOKk5o","name":"Warhammer","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"3","cost":100,"weight":7,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"VjZeKoAjAil3zCP1","name":"Lance","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"4","cost":75,"weight":5,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":2,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"ZgaKoQwsFx9horJW","name":"Knife/Dagger","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"1","cost":35,"weight":1,"idr":"2","range":"close","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"bCh6cquZdyqTBF48","name":"Nunchucks","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"2","cost":20,"weight":2,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"e0fYGBlTIA61v4Ju","name":"Energy Sword","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"7","cost":8000,"weight":2,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"piercing","damagetypelevel":2,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"fdErkTBx3aNMqRK9","name":"Halberd","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"5","cost":150,"weight":12,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"iQ0Y4Wz9VbyprlsK","name":"Bastard Sword","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"3","cost":650,"weight":5,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"iuaBa0BKY3cokhhy","name":"Brass Knuckles","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"1","cost":10,"weight":0.25,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"lhSUtg50SilX5JzJ","name":"Whip","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"1","cost":20,"weight":2,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"none","damagetypelevel":0,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"nb8ViPJh9CoQiwTn","name":"Chainsaw","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"4","cost":150,"weight":13,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"or9NvRF2U34fnJFd","name":"Flail","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"3","cost":100,"weight":8,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"qHTESL1bzq1KwqGd","name":"Poleaxe","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"4","cost":120,"weight":10,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"sKrsxqe1KdQ3YrTy","name":"Quarterstaff","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"2","cost":10,"weight":4,"idr":"2","range":"notapplicable","maxrange":"","ao":"","damagetype":"crushing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"zWIEpl30e2Hq3vJe","name":"Great Sword","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"4","cost":800,"weight":7,"idr":"4","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"zk3pxHsNhWEn6HSC","name":"Great Axe","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","data":{"statistic":"str","damage":"4","cost":100,"weight":8,"idr":"3","range":"notapplicable","maxrange":"","ao":"","damagetype":"slashing","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
diff --git a/system.json b/system.json
index 9f92441..71c8e8b 100644
--- a/system.json
+++ b/system.json
@@ -160,9 +160,9 @@
   "styles": [
     "styles/simple.css"
   ],
-  "templateVersion": 60,
+  "templateVersion": 61,
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "background" : "./images/ui/pegasus_welcome_page.webp"
 }
diff --git a/template.json b/template.json
index 2b8fc79..f59609f 100644
--- a/template.json
+++ b/template.json
@@ -432,6 +432,7 @@
     },
     "weapon": {
       "statistic": "",
+      "damagestatistic": "",
       "damage": "",
       "cost": 0,
       "weight": 0,
diff --git a/templates/item-weapon-sheet.html b/templates/item-weapon-sheet.html
index 3d866e6..33edff2 100644
--- a/templates/item-weapon-sheet.html
+++ b/templates/item-weapon-sheet.html
@@ -11,14 +11,23 @@
 
       <div class="tab" data-group="primary">
         <ul>
-          <li class="flexrow"><label class="generic-label">Related Statistic</label>
+          <li class="flexrow"><label class="generic-label">Related Attack Statistic</label>
             <select class="competence-base flexrow" type="text" name="data.statistic" value="{{data.statistic}}" data-dtype="String">
               {{#select data.statistic}}
-              {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true special=true}}
+              {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false special=true}}
               {{/select}}
             </select> 
           </li>
-          <li class="flexrow"><label class="generic-label">Damage</label>
+
+          <li class="flexrow"><label class="generic-label">Related DMG Statistic</label>
+            <select class="competence-base flexrow" type="text" name="data.damagestatistic" value="{{data.damagestatistic}}" data-dtype="String">
+              {{#select data.damagestatistic}}
+              {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false special=true}}
+              {{/select}}
+            </select> 
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Damage (Other Dice pool)</label>
             <select class="competence-base flexrow" type="text" name="data.damage" value="{{data.damage}}" data-dtype="String">
               {{#select data.damage}}
               {{{optionsDiceList}}}