Added Modifier & Weapon Type!!!