diff --git a/addons/atragmx/XEH_postInit.sqf b/addons/atragmx/XEH_postInit.sqf
index 9663ec0a92..4b61a28551 100644
--- a/addons/atragmx/XEH_postInit.sqf
+++ b/addons/atragmx/XEH_postInit.sqf
@@ -6,41 +6,41 @@ if ((profileNamespace getVariable ["ACE_ATragMX_profileNamespaceVersion", 0]) ==
     GVAR(gunList) = profileNamespace getVariable "ACE_ATragMX_gunList";
 } else {
     // Profile Name, Muzzle Velocity, Zero Range, Scope Base Angle, AirFriction, Bore Height, Scope Unit, Scope Click Unit, Scope Click Number, Maximum Elevation, Dialed Elevation, Dialed Windage, Mass, Bullet Diameter, Rifle Twist, BC, Drag Model, Atmosphere Model
-    GVAR(gunList) =  [["12.7x108mm"        , 820, 100, 0.0657, -0.0006469, 3.81, 0, 2, 10, 120, 0, 0, 48.28, 12.7, 38.10, 0.630, 1, "ASM" ],
+    GVAR(gunList) =  [["12.7x108mm"        , 820, 100, 0.0657485, -0.00063800, 3.81, 0, 2, 10, 120, 0, 0, 48.28, 12.7, 38.10, 0.630, 1, "ASM" ],
     
-                      ["12.7x99mm AMAX"    , 860, 100, 0.0612, -0.0003722, 3.81, 0, 2, 10, 120, 0, 0, 48.60, 12.7, 38.10, 1.050, 1, "ASM" ],
-                      ["12.7x99mm"         , 900, 100, 0.0623, -0.0005942, 3.81, 0, 2, 10, 120, 0, 0, 41.92, 12.7, 38.10, 0.670, 1, "ASM" ],
+                      ["12.7x99mm AMAX"    , 860, 100, 0.0611565, -0.00036645, 3.81, 0, 2, 10, 120, 0, 0, 48.60, 12.7, 38.10, 1.050, 1, "ASM" ],
+                      ["12.7x99mm"         , 900, 100, 0.0582418, -0.00057503, 3.81, 0, 2, 10, 120, 0, 0, 41.92, 12.7, 38.10, 0.670, 1, "ASM" ],
                       
-                      ["12.7x54mm"         , 300, 100, 0.3395, -0.0001877, 3.81, 0, 2, 10, 120, 0, 0, 48.60, 12.7, 24.13, 1.050, 1, "ASM" ],
+                      ["12.7x54mm"         , 300, 100, 0.3394630, -0.00019268, 3.81, 0, 2, 10, 120, 0, 0, 48.60, 12.7, 24.13, 1.050, 1, "ASM" ],
                       
-                      [".408 Chey Tac"     , 910, 100, 0.0571, -0.0003958, 3.81, 0, 2, 10, 120, 0, 0, 27.15, 10.4, 33.02, 0.970, 1, "ASM" ],
+                      [".408 Chey Tac"     , 910, 100, 0.0569400, -0.00038944, 3.81, 0, 2, 10, 120, 0, 0, 27.15, 10.4, 33.02, 0.970, 1, "ASM" ],
                       
-                      ["9.3×64mm"          , 870, 100, 0.0619, -0.0010921, 3.81, 0, 2, 10, 120, 0, 0, 14.90, 9.30, 35.56, 0.368, 1, "ASM" ],
+                      ["9.3×64mm"          , 870, 100, 0.0619295, -0.00108571, 3.81, 0, 2, 10, 120, 0, 0, 14.90, 9.30, 35.56, 0.368, 1, "ASM" ],
                       
-                      [".338LM 250gr"      , 880, 100, 0.0598, -0.0006234, 3.81, 0, 2, 10, 120, 0, 0, 16.20, 8.58, 25.40, 0.322, 7, "ICAO"],
-                      [".338LM 300gr"      , 800, 100, 0.0677, -0.0005397, 3.81, 0, 2, 10, 120, 0, 0, 19.44, 8.58, 25.40, 0.381, 7, "ICAO"],
-                      [".338LM API526"     , 895, 100, 0.0601, -0.0007120, 3.81, 0, 2, 10, 120, 0, 0, 16.39, 8.58, 25.40, 0.560, 1, "ASM" ],
+                      [".338LM 250gr"      , 880, 100, 0.0598469, -0.00059133, 3.81, 0, 2, 10, 120, 0, 0, 16.20, 8.58, 25.40, 0.322, 7, "ICAO"],
+                      [".338LM 300gr"      , 800, 100, 0.0677343, -0.00052190, 3.81, 0, 2, 10, 120, 0, 0, 19.44, 8.58, 25.40, 0.381, 7, "ICAO"],
+                      [".338LM API526"     , 895, 100, 0.0588865, -0.00069611, 3.81, 0, 2, 10, 120, 0, 0, 16.39, 8.58, 25.40, 0.560, 1, "ASM" ],
                       
-                      [".300WM Mk248 Mod 0", 900, 100, 0.0584, -0.0007305, 3.81, 0, 2, 10, 120, 0, 0, 13.31, 7.80, 25.40, 0.268, 7, "ICAO"],
-                      [".300WM Mk248 Mod 1", 867, 100, 0.0611, -0.0006326, 3.81, 0, 2, 10, 120, 0, 0, 14.26, 7.80, 25.40, 0.310, 7, "ICAO"],
-                      [".300WM Berger OTM" , 853, 100, 0.0622, -0.0005271, 3.81, 0, 2, 10, 120, 0, 0, 14.90, 7.80, 25.40, 0.368, 7, "ICAO"],
+                      [".300WM Mk248 Mod 0", 900, 100, 0.0584442, -0.00070530, 3.81, 0, 2, 10, 120, 0, 0, 13.31, 7.80, 25.40, 0.268, 7, "ICAO"],
+                      [".300WM Mk248 Mod 1", 867, 100, 0.0610738, -0.00061188, 3.81, 0, 2, 10, 120, 0, 0, 14.26, 7.80, 25.40, 0.310, 7, "ICAO"],
+                      [".300WM Berger OTM" , 853, 100, 0.0622179, -0.00053733, 3.81, 0, 2, 10, 120, 0, 0, 14.90, 7.80, 25.40, 0.368, 7, "ICAO"],
                       
-                      ["7.62x54mmR"        , 800, 100, 0.0692, -0.0010165, 3.81, 0, 2, 10, 120, 0, 0, 9.849, 7.92, 24.13, 0.400, 1, "ICAO"],
+                      ["7.62x54mmR"        , 800, 100, 0.0691878, -0.00100023, 3.81, 0, 2, 10, 120, 0, 0, 9.849, 7.92, 24.13, 0.400, 1, "ICAO"],
                       
-                      ["7.62x51mm M80"     , 810, 100, 0.0679, -0.0010319, 3.81, 0, 2, 10, 120, 0, 0, 9.525, 7.82, 25.40, 0.200, 7, "ICAO"],
-                      ["7.62x51mm M118LR"  , 780, 100, 0.0710, -0.0008497, 3.81, 0, 2, 10, 120, 0, 0, 11.34, 7.82, 25.40, 0.243, 7, "ICAO"],
-                      ["7.62x51mm Mk319"   , 910, 100, 0.0585, -0.0010435, 3.81, 0, 2, 10, 120, 0, 0, 8.424, 7.82, 25.40, 0.377, 1, "ICAO"],
-                      ["7.62x51mm M993"    , 930, 100, 0.0585, -0.0010914, 3.81, 0, 2, 10, 120, 0, 0, 8.230, 7.82, 25.40, 0.359, 1, "ICAO"],
-                      ["7.62x51mm Subsonic", 320, 100, 0.3060, -0.0004145, 3.81, 0, 2, 10, 120, 0, 0, 12.96, 7.82, 25.40, 0.235, 7, "ICAO"],
+                      ["7.62x51mm M80"     , 810, 100, 0.0679374, -0.00100957, 3.81, 0, 2, 10, 120, 0, 0, 9.525, 7.82, 25.40, 0.200, 7, "ICAO"],
+                      ["7.62x51mm M118LR"  , 780, 100, 0.0710319, -0.00082828, 3.81, 0, 2, 10, 120, 0, 0, 11.34, 7.82, 25.40, 0.243, 7, "ICAO"],
+                      ["7.62x51mm Mk319"   , 910, 100, 0.0584524, -0.00102338, 3.81, 0, 2, 10, 120, 0, 0, 8.424, 7.82, 25.40, 0.377, 1, "ICAO"],
+                      ["7.62x51mm M993"    , 930, 100, 0.0570316, -0.00107148, 3.81, 0, 2, 10, 120, 0, 0, 8.230, 7.82, 25.40, 0.359, 1, "ICAO"],
+                      ["7.62x51mm Subsonic", 320, 100, 0.3059680, -0.00049899, 3.81, 0, 2, 10, 120, 0, 0, 12.96, 7.82, 25.40, 0.235, 7, "ICAO"],
                       
-                      ["6.5x39mm"          , 800, 100, 0.0683, -0.0007728, 3.81, 0, 2, 10, 120, 0, 0, 7.970, 6.71, 22.86, 0.263, 7, "ICAO"],
-                      ["6.5x47mm Lapua"    , 800, 100, 0.0682, -0.0006977, 3.81, 0, 2, 10, 120, 0, 0, 9.007, 6.71, 22.86, 0.290, 7, "ICAO"],
-                      ["6.5mm Creedmor"    , 840, 100, 0.0637, -0.0006136, 3.81, 0, 2, 10, 120, 0, 0, 9.072, 6.71, 22.86, 0.317, 7, "ICAO"],
+                      ["6.5x39mm"          , 800, 100, 0.0683482, -0.00075308, 3.81, 0, 2, 10, 120, 0, 0, 7.970, 6.71, 22.86, 0.263, 7, "ICAO"],
+                      ["6.5x47mm Lapua"    , 800, 100, 0.0682221, -0.00067037, 3.81, 0, 2, 10, 120, 0, 0, 9.007, 6.71, 22.86, 0.290, 7, "ICAO"],
+                      ["6.5mm Creedmor"    , 840, 100, 0.0636501, -0.00060887, 3.81, 0, 2, 10, 120, 0, 0, 9.072, 6.71, 22.86, 0.317, 7, "ICAO"],
                       
-                      ["5.56x45mm M855"    , 870, 100, 0.0626, -0.0013685, 3.81, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.151, 7, "ASM" ],
-                      ["5.56x45mm Mk262"   , 820, 100, 0.0671, -0.0011287, 3.81, 0, 2, 10, 120, 0, 0, 4.990, 5.70, 17.78, 0.361, 1, "ASM" ],
-                      ["5.56x45mm Mk318"   , 880, 100, 0.0616, -0.0013064, 3.81, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.307, 1, "ASM" ],
-                      ["5.56x45mm M995"    , 869, 100, 0.0616, -0.0012972, 3.81, 0, 2, 10, 120, 0, 0, 4.536, 5.70, 17.78, 0.310, 1, "ASM" ]];
+                      ["5.56x45mm M855"    , 870, 100, 0.0626386, -0.00126466, 3.81, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.151, 7, "ASM" ],
+                      ["5.56x45mm Mk262"   , 820, 100, 0.0671481, -0.00109563, 3.81, 0, 2, 10, 120, 0, 0, 4.990, 5.70, 17.78, 0.361, 1, "ASM" ],
+                      ["5.56x45mm Mk318"   , 880, 100, 0.0615937, -0.00123318, 3.81, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.307, 1, "ASM" ],
+                      ["5.56x45mm M995"    , 869, 100, 0.0626713, -0.00123272, 3.81, 0, 2, 10, 120, 0, 0, 4.536, 5.70, 17.78, 0.310, 1, "ASM" ]];
     
     [] call FUNC(clear_user_data);
     profileNamespace setVariable ["ACE_ATragMX_gunList", GVAR(gunList)];
diff --git a/addons/atragmx/script_component.hpp b/addons/atragmx/script_component.hpp
index 40d62e440e..8154ffa04b 100644
--- a/addons/atragmx/script_component.hpp
+++ b/addons/atragmx/script_component.hpp
@@ -11,4 +11,4 @@
 
 #include "\z\ace\addons\main\script_macros.hpp"
 
-#define ATRAGMX_PROFILE_NAMESPACE_VERSION 1.6
+#define ATRAGMX_PROFILE_NAMESPACE_VERSION 1.7
diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp
index 74b8d1e4c3..5ffe94ac45 100644
--- a/addons/ballistics/CfgAmmo.hpp
+++ b/addons/ballistics/CfgAmmo.hpp
@@ -20,7 +20,7 @@ class CfgAmmo {
     };
     
     class B_556x45_Ball : BulletBase {
-        airFriction=-0.0013685;
+        airFriction=-0.00126466;
         hit=8;
         typicalSpeed=750;
         tracerStartTime=0.073;  // M856 tracer burns out to 800m
@@ -37,7 +37,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6};
     };
     class ACE_556x45_Ball_Mk262 : B_556x45_Ball {
-        airFriction=-0.0011287;
+        airFriction=-0.00109563;
         caliber=0.8;
         deflecting=18;
         hit=11;
@@ -54,7 +54,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0};
     };
     class ACE_556x45_Ball_Mk318 : B_556x45_Ball {
-        airFriction=-0.0013064;
+        airFriction=-0.00123318;
         caliber=0.8;
         deflecting=18;
         hit=9;
@@ -71,7 +71,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={254.0, 393.7, 508.0};
     };
     class ACE_556x45_Ball_M995_AP : B_556x45_Ball {
-        airFriction=-0.0012972;
+        airFriction=-0.00123272;
         caliber=1.6;
         deflecting=18;
         hit=6;
@@ -92,7 +92,7 @@ class CfgAmmo {
         nvgOnly = 1;
     };
     class ACE_545x39_Ball_7N6M : B_556x45_Ball {
-        airFriction=-0.001222;
+        airFriction=-0.00114744;
         caliber=0.6;
         deflecting=18;
         hit=7;
@@ -110,7 +110,7 @@ class CfgAmmo {
     };
     class B_556x45_Ball_Tracer_Green;
     class ACE_545x39_Ball_7T3M : B_556x45_Ball_Tracer_Green {
-        airFriction=-0.001222;
+        airFriction=-0.00114744;
         caliber=0.6;
         deflecting=18;
         hit=7;
@@ -129,7 +129,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={254.0, 414.02, 508.0};
     };
     class B_65x39_Caseless : BulletBase {
-        airFriction=-0.0007728;
+        airFriction=-0.00075308;
         typicalSpeed=800;
         ACE_caliber=6.706;
         ACE_bulletLength=32.893;
@@ -151,7 +151,7 @@ class CfgAmmo {
         nvgOnly = 1;
     };
     class ACE_65x47_Ball_Scenar: B_65x39_Caseless {
-        airFriction=-0.0006977;
+        airFriction=-0.00067037;
         typicalSpeed=820 ;
         caliber=0.9;
         ACE_caliber=6.706;
@@ -166,7 +166,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4};
     };
     class ACE_65_Creedmor_Ball: B_65x39_Caseless {
-        airFriction=-0.0006136;
+        airFriction=-0.00060887;
         typicalSpeed=860 ;
         caliber=1.1;
         ACE_caliber=6.706;
@@ -181,7 +181,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4};
     };
     class B_762x51_Ball : BulletBase {
-        airFriction=-0.0010319;
+        airFriction=-0.00100957;
         typicalSpeed=833;
         hit=9;
         tracerStartTime=0.073;  // Based on the British L5A1 which burns out to 1000m 
@@ -202,7 +202,7 @@ class CfgAmmo {
         nvgOnly = 1;
     };
     class ACE_762x51_Ball_M118LR : B_762x51_Ball {
-        airFriction=-0.0008497;
+        airFriction=-0.00082828;
         caliber=1.8;
         hit=16;
         typicalSpeed=790;
@@ -218,7 +218,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
     };
     class ACE_762x51_Ball_Mk316_Mod_0 : B_762x51_Ball {
-        airFriction=-0.0008421;
+        airFriction=-0.00082029;
         caliber=1.8;
         hit=16;
         typicalSpeed=790;
@@ -234,7 +234,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
     };
     class ACE_762x51_Ball_Mk319_Mod_0 : B_762x51_Ball {
-        airFriction=-0.0010435;
+        airFriction=-0.00102338;
         caliber=1.5;
         hit=14;
         typicalSpeed=900;
@@ -250,7 +250,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={330.2, 406.4, 508.0};
     };
     class ACE_762x51_Ball_M993_AP : B_762x51_Ball {
-        airFriction=-0.0010914;
+        airFriction=-0.00107148;
         caliber=2.2;
         hit=11;
         typicalSpeed=910;
@@ -266,7 +266,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={330.2, 406.4, 508.0};
     };
     class ACE_762x51_Ball_Subsonic : B_762x51_Ball {
-        airFriction=-0.0004145;
+        airFriction=-0.00049899;
         caliber=1;
         hit=6;
         typicalSpeed=320;
@@ -282,7 +282,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
     };
     class ACE_30_06_M1_Ball : B_762x51_Ball {
-        airFriction=-0.0008290;
+        airFriction=-0.00080900;
         typicalSpeed=800;
         caliber=2.0;
         hit=10;
@@ -298,7 +298,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4};
     };
     class ACE_7_Remington_Magnum_Ball : B_762x51_Ball {
-        airFriction=-0.0005809;
+        airFriction=-0.00056738;
         typicalSpeed=820;
         caliber=2.1;
         hit=8;
@@ -314,7 +314,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4};
     };
     class ACE_243_Winchester_Ball : B_762x51_Ball {
-        airFriction=-0.0007010;
+        airFriction=-0.00067875;
         typicalSpeed=915;
         caliber=2.3;
         hit=6;
@@ -330,7 +330,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4};
     };
     class ACE_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball {
-        airFriction=-0.0007305;
+        airFriction=-0.00070530;
         caliber=1.8;
         hit=17;
         typicalSpeed=900;
@@ -346,7 +346,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={508.0, 609.6, 660.4};
     };
     class ACE_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball {
-        airFriction=-0.0006326;
+        airFriction=-0.00061188;
         caliber=1.9;
         hit=18;
         typicalSpeed=867;
@@ -362,7 +362,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={508.0, 609.6, 660.4};
     };
     class ACE_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball {
-        airFriction=-0.0005271;
+        airFriction=-0.00053733;
         caliber=2.0;
         hit=19;
         typicalSpeed=853;
@@ -378,7 +378,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={508.0, 609.6, 660.4};
     };
     class B_762x54_Ball: B_762x51_Ball {
-        airFriction=-0.0010165;
+        airFriction=-0.00100023;
         typicalSpeed=820;
         ACE_caliber=7.925;
         ACE_bulletLength=28.956;
@@ -392,7 +392,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
     };
     class ACE_762x54_Ball_7N14 : B_762x51_Ball {
-        airFriction=-0.0010165;
+        airFriction=-0.00100023;
         caliber=1.5;
         hit=15;
         typicalSpeed=820;
@@ -409,7 +409,7 @@ class CfgAmmo {
     };
     class B_762x54_Tracer_Green;
     class ACE_762x54_Ball_7T2 : B_762x54_Tracer_Green {
-        airFriction=-0.0010369;
+        airFriction=-0.00103989;
         caliber=1.5;
         hit=15;
         typicalSpeed=800;
@@ -427,7 +427,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
     };
     class ACE_762x35_Ball : B_762x51_Ball {
-        airFriction=-0.0012406;
+        airFriction=-0.00128942;
         caliber=1.5;
         hit=11;
         typicalSpeed=790;
@@ -443,7 +443,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={228.6, 406.4, 508.0};
     };
     class ACE_762x39_Ball : B_762x51_Ball {
-        airFriction=-0.0014519;
+        airFriction=-0.00151621;
         hit=12;
         caliber=1.5;
         typicalSpeed=716;
@@ -459,7 +459,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={254.0, 414.02, 508.0};
     };
     class ACE_762x39_Ball_57N231P : B_762x54_Tracer_Green {
-        airFriction=-0.0015168;
+        airFriction=-0.00151621;
         hit=12;
         caliber=1.5;
         typicalSpeed=716;
@@ -477,7 +477,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={254.0, 414.02, 508.0};
     };
     class B_9x21_Ball : BulletBase {
-        airFriction=-0.0021165;
+        airFriction=-0.00226847;
         typicalSpeed=390;
         hit=6;
         ACE_caliber=9.042;
@@ -493,7 +493,7 @@ class CfgAmmo {
     };
     class ACE_9x18_Ball_57N181S : B_9x21_Ball {
         hit=5;
-        airFriction=-0.0015655;
+        airFriction=-0.00190333;
         typicalSpeed=298;
         ACE_caliber=9.271;
         ACE_bulletLength=15.494;
@@ -507,7 +507,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={96.52, 127.0, 228.6};
     };
     class ACE_9x19_Ball : B_9x21_Ball {
-        airFriction=-0.0015833;
+        airFriction=-0.0018577;
         typicalSpeed=370;
         hit=6;
         ACE_caliber=9.017;
@@ -522,7 +522,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={101.6, 127.0, 228.6};
     };
     class ACE_10x25_Ball : B_9x21_Ball {
-        airFriction=-0.00168;
+        airFriction=-0.00181928;
         typicalSpeed=425;
         hit=7;
         ACE_caliber=12.7;
@@ -537,7 +537,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={101.6, 117.094, 228.6};
     };
     class ACE_765x17_Ball: B_9x21_Ball {
-        airFriction=-0.001410;
+        airFriction=-0.00163356;
         typicalSpeed=282;
         hit=7;
         ACE_caliber=7.938;
@@ -552,7 +552,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={101.6, 127.0, 228.6};
     };
     class ACE_303_Ball : ACE_762x51_Ball_M118LR {
-        airFriction=-0.0008410;
+        airFriction=-0.0008349;
         typicalSpeed=761;
         caliber=2.0;
         ACE_caliber=7.899;
@@ -567,7 +567,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={508.0, 609.6, 660.4};
     };
     class B_93x64_Ball : BulletBase {
-        airFriction=-0.0010921;
+        airFriction=-0.00108571;
         typicalSpeed=880;
         ACE_caliber=9.296;
         ACE_bulletLength=34.29;
@@ -582,7 +582,7 @@ class CfgAmmo {
     };
     class B_408_Ball : BulletBase {
         timeToLive=10;
-        airFriction=-0.0003958;
+        airFriction=-0.00038944;
         typicalSpeed=910;
         ACE_caliber=10.363;
         ACE_bulletLength=54.0;
@@ -598,6 +598,7 @@ class CfgAmmo {
     };
     class ACE_106x83mm_Ball : B_408_Ball {
         timeToLive=10;
+        airFriction=-0.00052047;
         ACE_caliber=10.566;
         ACE_bulletLength=53.061;
         ACE_bulletMass=25.7904;
@@ -611,7 +612,7 @@ class CfgAmmo {
     };
     class B_338_Ball : BulletBase {
         timeToLive=10;
-        airFriction=-0.0006234;
+        airFriction=-0.00059133;
         typicalSpeed=915;
         ACE_caliber=8.585;
         ACE_bulletLength=39.573;
@@ -625,7 +626,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={508.0, 660.4, 711.2};
     };
     class B_338_NM_Ball : BulletBase {
-        airFriction=-0.0005434;
+        airFriction=-0.00052201;
         typicalSpeed=820;
         ACE_caliber=8.585;
         ACE_bulletLength=43.18;
@@ -640,7 +641,7 @@ class CfgAmmo {
     };
     class ACE_338_Ball : B_338_Ball {
         timeToLive=10;
-        airFriction=-0.0005397;
+        airFriction=-0.00052190;
         typicalSpeed=826;
         ACE_caliber=8.585;
         ACE_bulletLength=43.18;
@@ -655,7 +656,7 @@ class CfgAmmo {
     };
     class ACE_338_Ball_API526 : B_338_Ball {
         timeToLive=10;
-        airFriction=-0.0007120;
+        airFriction=-0.00069611;
         caliber=2.8;
         typicalSpeed=895;
         ACE_caliber=8.585;
@@ -670,7 +671,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={508.0, 660.4, 711.2};
     };
     class B_127x54_Ball : BulletBase {
-        airFriction=-0.0001877;
+        airFriction=-0.00019268;
         typicalSpeed=300;
         ACE_caliber=12.954;
         ACE_bulletLength=64.516;
@@ -685,7 +686,7 @@ class CfgAmmo {
     };
     class B_127x99_Ball : BulletBase {
         timeToLive=10;
-        airFriction=-0.0005942;
+        airFriction=-0.00057503;
         typicalSpeed=900;
         ACE_caliber=12.954;
         ACE_bulletLength=58.674;
@@ -700,7 +701,7 @@ class CfgAmmo {
     };
     class ACE_127x99_API : BulletBase {
         timeToLive=10;
-        airFriction=-0.0005886;
+        airFriction=-0.00057503;
         typicalSpeed=900;
         hit=25;
         caliber=4.0;
@@ -717,7 +718,7 @@ class CfgAmmo {
     };
     class ACE_127x99_Ball_AMAX : B_127x99_Ball {
         timeToLive=10;
-        airFriction=-0.0003722;
+        airFriction=-0.00036645;
         typicalSpeed=860;
         caliber=3.0;
         ACE_caliber=12.954;
@@ -733,7 +734,7 @@ class CfgAmmo {
     };
     class B_127x108_Ball : BulletBase {
         timeToLive=10;
-        airFriction=-0.0006469;
+        airFriction=-0.00063800;
         typicalSpeed=820;
         ACE_caliber=12.979;
         ACE_bulletLength=64.008;
@@ -747,7 +748,7 @@ class CfgAmmo {
         ACE_barrelLengths[]={728.98};
     };
     class B_45ACP_Ball : BulletBase {
-        airFriction=-0.0007312;
+        airFriction=-0.00081221;
         typicalSpeed=250;
         ACE_caliber=11.481;
         ACE_bulletLength=17.272;
diff --git a/extras/airFrictionAnalysis.txt b/extras/airFrictionAnalysis.txt
new file mode 100644
index 0000000000..722077578b
--- /dev/null
+++ b/extras/airFrictionAnalysis.txt
@@ -0,0 +1,336 @@
+##########################################
+Ammo Class: B_556x45_Ball
+MaxRanges (m): [300, 500, 500]
+MuzzleVelocities (m/s): [750, 870, 910]
+Max. velocity difference (m/s): 25.51
+Max. drop difference (cm): 2.05
+Max. tof difference (ms): 10.0
+Optimal airFriction: 0.00126466
+##########################################
+Ammo Class: ACE_556x45_Ball_Mk262
+MaxRanges (m): [600, 600]
+MuzzleVelocities (m/s): [810, 840]
+Max. velocity difference (m/s): 14.9
+Max. drop difference (cm): 2.67
+Max. tof difference (ms): 10.0
+Optimal airFriction: 0.00109563
+##########################################
+Ammo Class: ACE_556x45_Ball_Mk318
+MaxRanges (m): [300, 500, 500]
+MuzzleVelocities (m/s): [780, 880, 950]
+Max. velocity difference (m/s): 20.86
+Max. drop difference (cm): 2.29
+Max. tof difference (ms): 9.0
+Optimal airFriction: 0.00123318
+##########################################
+Ammo Class: ACE_556x45_Ball_M995_AP
+MaxRanges (m): [400, 500]
+MuzzleVelocities (m/s): [820, 880]
+Max. velocity difference (m/s): 17.92
+Max. drop difference (cm): 1.25
+Max. tof difference (ms): 7.0
+Optimal airFriction: 0.00123272
+##########################################
+Ammo Class: ACE_545x39_Ball_7N6M
+MaxRanges (m): [400, 500]
+MuzzleVelocities (m/s): [780, 880, 920]
+Max. velocity difference (m/s): 19.71
+Max. drop difference (cm): 2.04
+Max. tof difference (ms): 8.0
+Optimal airFriction: 0.00114744
+##########################################
+Ammo Class: B_65x39_Caseless
+MaxRanges (m): [400, 800, 800]
+MuzzleVelocities (m/s): [730, 800, 830]
+Max. velocity difference (m/s): 22.17
+Max. drop difference (cm): 4.83
+Max. tof difference (ms): 16.0
+Optimal airFriction: 0.00075308
+##########################################
+Ammo Class: ACE_65x47_Ball_Scenar
+MaxRanges (m): [500, 800]
+MuzzleVelocities (m/s): [730, 830]
+Max. velocity difference (m/s): 16.94
+Max. drop difference (cm): 2.67
+Max. tof difference (ms): 9.0
+Optimal airFriction: 0.00067037
+##########################################
+Ammo Class: ACE_65_Creedmor_Ball
+MaxRanges (m): [600, 1000]
+MuzzleVelocities (m/s): [750, 860]
+Max. velocity difference (m/s): 21.08
+Max. drop difference (cm): 4.29
+Max. tof difference (ms): 14.0
+Optimal airFriction: 0.00060887
+##########################################
+Ammo Class: B_762x51_Ball
+MaxRanges (m): [500, 800]
+MuzzleVelocities (m/s): [700, 833]
+Max. velocity difference (m/s): 27.7
+Max. drop difference (cm): 6.71
+Max. tof difference (ms): 23.0
+Optimal airFriction: 0.00100957
+##########################################
+Ammo Class: ACE_762x51_Ball_M118LR
+MaxRanges (m): [600, 800]
+MuzzleVelocities (m/s): [750, 795]
+Max. velocity difference (m/s): 23.28
+Max. drop difference (cm): 3.65
+Max. tof difference (ms): 17.0
+Optimal airFriction: 0.00082828
+##########################################
+Ammo Class: ACE_762x51_Ball_Mk316_Mod_0
+MaxRanges (m): [600, 800]
+MuzzleVelocities (m/s): [780, 810]
+Max. velocity difference (m/s): 23.39
+Max. drop difference (cm): 3.25
+Max. tof difference (ms): 16.0
+Optimal airFriction: 0.00082029
+##########################################
+Ammo Class: ACE_762x51_Ball_Mk319_Mod_0
+MaxRanges (m): [600, 800]
+MuzzleVelocities (m/s): [840, 910]
+Max. velocity difference (m/s): 19.18
+Max. drop difference (cm): 3.9
+Max. tof difference (ms): 17.0
+Optimal airFriction: 0.00102338
+##########################################
+Ammo Class: ACE_762x51_Ball_M993_AP
+MaxRanges (m): [600, 800]
+MuzzleVelocities (m/s): [875, 930]
+Max. velocity difference (m/s): 19.39
+Max. drop difference (cm): 4.08
+Max. tof difference (ms): 18.0
+Optimal airFriction: 0.00107148
+##########################################
+Ammo Class: ACE_30_06_M1_Ball
+MaxRanges (m): [600, 800, 900]
+MuzzleVelocities (m/s): [700, 800, 840]
+Max. velocity difference (m/s): 14.56
+Max. drop difference (cm): 7.89
+Max. tof difference (ms): 15.0
+Optimal airFriction: 0.000809
+##########################################
+Ammo Class: ACE_7_Remington_Magnum_Ball
+MaxRanges (m): [600, 800, 1000]
+MuzzleVelocities (m/s): [720, 812, 830]
+Max. velocity difference (m/s): 17.47
+Max. drop difference (cm): 4.54
+Max. tof difference (ms): 11.0
+Optimal airFriction: 0.00056738
+##########################################
+Ammo Class: ACE_243_Winchester_Ball
+MaxRanges (m): [700, 900, 900]
+MuzzleVelocities (m/s): [830, 900, 920]
+Max. velocity difference (m/s): 22.55
+Max. drop difference (cm): 4.78
+Max. tof difference (ms): 13.0
+Optimal airFriction: 0.00067875
+##########################################
+Ammo Class: ACE_762x67_Ball_Mk248_Mod_0
+MaxRanges (m): [800, 900, 900]
+MuzzleVelocities (m/s): [865, 900, 924]
+Max. velocity difference (m/s): 24.43
+Max. drop difference (cm): 5.17
+Max. tof difference (ms): 15.0
+Optimal airFriction: 0.0007053
+##########################################
+Ammo Class: ACE_762x67_Ball_Mk248_Mod_1
+MaxRanges (m): [800, 900, 900]
+MuzzleVelocities (m/s): [847, 867, 877]
+Max. velocity difference (m/s): 20.16
+Max. drop difference (cm): 2.99
+Max. tof difference (ms): 12.0
+Optimal airFriction: 0.00061188
+##########################################
+Ammo Class: ACE_762x67_Ball_Berger_Hybrid_OTM
+MaxRanges (m): [900, 1000, 1000]
+MuzzleVelocities (m/s): [800, 853, 884]
+Max. velocity difference (m/s): 19.65
+Max. drop difference (cm): 8.25
+Max. tof difference (ms): 16.0
+Optimal airFriction: 0.00053733
+##########################################
+Ammo Class: B_762x54_Ball
+MaxRanges (m): [500, 800, 800]
+MuzzleVelocities (m/s): [700, 820, 833]
+Max. velocity difference (m/s): 14.61
+Max. drop difference (cm): 5.74
+Max. tof difference (ms): 15.0
+Optimal airFriction: 0.00100023
+##########################################
+Ammo Class: ACE_762x35_Ball
+MaxRanges (m): [400, 500]
+MuzzleVelocities (m/s): [620, 675]
+Max. velocity difference (m/s): 4.17
+Max. drop difference (cm): 1.71
+Max. tof difference (ms): 4.0
+Optimal airFriction: 0.00128942
+##########################################
+Ammo Class: ACE_762x39_Ball
+MaxRanges (m): [400, 600]
+MuzzleVelocities (m/s): [650, 750]
+Max. velocity difference (m/s): 13.0
+Max. drop difference (cm): 3.78
+Max. tof difference (ms): 8.0
+Optimal airFriction: 0.00151621
+##########################################
+Ammo Class: ACE_762x54_Ball_7T2
+MaxRanges (m): [500, 800, 800]
+MuzzleVelocities (m/s): [680, 750, 800]
+Max. velocity difference (m/s): 9.79
+Max. drop difference (cm): 7.89
+Max. tof difference (ms): 11.0
+Optimal airFriction: 0.00103989
+##########################################
+Ammo Class: ACE_303_Ball
+MaxRanges (m): [900, 1000]
+MuzzleVelocities (m/s): [748, 765]
+Max. velocity difference (m/s): 7.24
+Max. drop difference (cm): 5.65
+Max. tof difference (ms): 11.0
+Optimal airFriction: 0.0008349
+##########################################
+Ammo Class: B_93x64_Ball
+MaxRanges (m): [900, 1000]
+MuzzleVelocities (m/s): [850, 880]
+Max. velocity difference (m/s): 11.18
+Max. drop difference (cm): 9.08
+Max. tof difference (ms): 15.0
+Optimal airFriction: 0.00108571
+##########################################
+Ammo Class: B_408_Ball
+MaxRanges (m): [1600, 1600]
+MuzzleVelocities (m/s): [905, 915]
+Max. velocity difference (m/s): 19.47
+Max. drop difference (cm): 9.17
+Max. tof difference (ms): 22.0
+Optimal airFriction: 0.00038944
+##########################################
+Ammo Class: ACE_106x83mm_Ball
+MaxRanges (m): [1400, 1400]
+MuzzleVelocities (m/s): [955, 965]
+Max. velocity difference (m/s): 23.44
+Max. drop difference (cm): 8.93
+Max. tof difference (ms): 25.0
+Optimal airFriction: 0.00052047
+##########################################
+Ammo Class: B_338_Ball
+MaxRanges (m): [1100, 1300]
+MuzzleVelocities (m/s): [880, 925]
+Max. velocity difference (m/s): 31.95
+Max. drop difference (cm): 9.97
+Max. tof difference (ms): 33.0
+Optimal airFriction: 0.00059133
+##########################################
+Ammo Class: B_338_NM_Ball
+MaxRanges (m): [1100, 1300]
+MuzzleVelocities (m/s): [790, 820]
+Max. velocity difference (m/s): 24.5
+Max. drop difference (cm): 8.87
+Max. tof difference (ms): 27.0
+Optimal airFriction: 0.00052201
+##########################################
+Ammo Class: ACE_338_Ball
+MaxRanges (m): [1200, 1300]
+MuzzleVelocities (m/s): [800, 830]
+Max. velocity difference (m/s): 23.06
+Max. drop difference (cm): 11.27
+Max. tof difference (ms): 25.0
+Optimal airFriction: 0.0005219
+##########################################
+Ammo Class: ACE_338_Ball_API526
+MaxRanges (m): [1200, 1300]
+MuzzleVelocities (m/s): [880, 920]
+Max. velocity difference (m/s): 17.05
+Max. drop difference (cm): 14.52
+Max. tof difference (ms): 29.0
+Optimal airFriction: 0.00069611
+##########################################
+Ammo Class: B_127x99_Ball
+MaxRanges (m): [1300, 1300]
+MuzzleVelocities (m/s): [895, 905]
+Max. velocity difference (m/s): 19.44
+Max. drop difference (cm): 9.36
+Max. tof difference (ms): 24.0
+Optimal airFriction: 0.00057503
+##########################################
+Ammo Class: ACE_127x99_Ball_AMAX
+MaxRanges (m): [1600, 1600]
+MuzzleVelocities (m/s): [855, 865]
+Max. velocity difference (m/s): 16.61
+Max. drop difference (cm): 9.1
+Max. tof difference (ms): 20.0
+Optimal airFriction: 0.00036645
+##########################################
+Ammo Class: B_127x108_Ball
+MaxRanges (m): [1300, 1300]
+MuzzleVelocities (m/s): [815, 825]
+Max. velocity difference (m/s): 10.66
+Max. drop difference (cm): 11.74
+Max. tof difference (ms): 22.0
+Optimal airFriction: 0.000638
+##########################################
+Ammo Class: ACE_762x51_Ball_Subsonic
+MaxRanges (m): [200, 300]
+MuzzleVelocities (m/s): [305, 340]
+Max. velocity difference (m/s): 7.92
+Max. drop difference (cm): 3.77
+Max. tof difference (ms): 9.0
+Optimal airFriction: 0.00049899
+##########################################
+Ammo Class: B_9x21_Ball
+MaxRanges (m): [200, 300, 300]
+MuzzleVelocities (m/s): [440, 460, 480]
+Max. velocity difference (m/s): 37.94
+Max. drop difference (cm): 5.27
+Max. tof difference (ms): 31.0
+Optimal airFriction: 0.00226847
+##########################################
+Ammo Class: ACE_9x18_Ball_57N181S
+MaxRanges (m): [100, 200, 200]
+MuzzleVelocities (m/s): [298, 330, 350]
+Max. velocity difference (m/s): 18.03
+Max. drop difference (cm): 4.41
+Max. tof difference (ms): 17.0
+Optimal airFriction: 0.00190333
+##########################################
+Ammo Class: ACE_9x19_Ball
+MaxRanges (m): [100, 200, 200]
+MuzzleVelocities (m/s): [340, 370, 400]
+Max. velocity difference (m/s): 17.59
+Max. drop difference (cm): 6.56
+Max. tof difference (ms): 10.0
+Optimal airFriction: 0.0018577
+##########################################
+Ammo Class: ACE_10x25_Ball
+MaxRanges (m): [200, 300, 300]
+MuzzleVelocities (m/s): [360, 400, 430]
+Max. velocity difference (m/s): 32.8
+Max. drop difference (cm): 8.8
+Max. tof difference (ms): 34.0
+Optimal airFriction: 0.00181928
+##########################################
+Ammo Class: ACE_765x17_Ball
+MaxRanges (m): [100, 200, 200]
+MuzzleVelocities (m/s): [282, 300, 320]
+Max. velocity difference (m/s): 11.18
+Max. drop difference (cm): 4.3
+Max. tof difference (ms): 13.0
+Optimal airFriction: 0.00163356
+##########################################
+Ammo Class: B_127x54_Ball
+MaxRanges (m): [500, 500]
+MuzzleVelocities (m/s): [295, 305]
+Max. velocity difference (m/s): 2.28
+Max. drop difference (cm): 4.52
+Max. tof difference (ms): 5.0
+Optimal airFriction: 0.00019268
+##########################################
+Ammo Class: B_45ACP_Ball
+MaxRanges (m): [100, 200, 200]
+MuzzleVelocities (m/s): [230, 250, 285]
+Max. velocity difference (m/s): 3.5
+Max. drop difference (cm): 2.99
+Max. tof difference (ms): 6.0
+Optimal airFriction: 0.00081221
\ No newline at end of file