W update, Better dmg calc