diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
index 991d46496..ae332f6e6 100644
--- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
+++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
@@ -211,7 +211,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
             // TODO: The raft currently does not handle brim correctly. So it needs to be fixed before it is enabled.
             new MapItemToBool("enableRaft", "create_raft"),
             new MapItem("raftExtraDistanceAroundPart", "raft_extra_distance_around_part"),
-            new MapItem("raftAirGap", "raft_air_gap"),
+			new MapItem("raftAirGap", "raft_air_gap"),
+			new MapItem("supportAirGap", "support_air_gap"),
 
             new VisibleButNotMappedToEngine("has_fan"),
             new VisibleButNotMappedToEngine("has_hardware_leveling"),
@@ -270,9 +271,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
             //supportXYDistanceFromObject=0.7 # The closest xy distance that support will be to the object. mm/s.
             new MapItem("supportXYDistanceFromObject", "support_material_xy_distance"),
 
-            //supportZDistanceFromObject=1 # The number of layers to skip in z. The gap between the support and the model.
-            new AsCountOrDistance("supportNumberOfLayersToSkipInZ", "support_material_z_gap_layers", "layer_height"),
-
             new AsCountOrDistance("supportInterfaceLayers", "support_material_interface_layers", "layer_height"),
 
             //travelSpeed=200 # The speed to move when not extruding material. mm/s.
diff --git a/StaticData/PrinterSettings/config.ini b/StaticData/PrinterSettings/config.ini
index 3b8cacb88..6fd7aed59 100644
--- a/StaticData/PrinterSettings/config.ini
+++ b/StaticData/PrinterSettings/config.ini
@@ -129,6 +129,7 @@ standby_temperature_delta = -5
 start_gcode = G28 ; home all axes\nG1 Z5 F5000 ; lift nozzle
 start_perimeters_at_concave_points = 0
 start_perimeters_at_non_overhang = 0
+support_air_gap = .3
 support_material = 0
 support_material_angle = 45
 support_material_create_internal_support = 0
diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt
index eb63c9ba1..f30b169d0 100644
--- a/StaticData/SliceSettings/Layouts.txt
+++ b/StaticData/SliceSettings/Layouts.txt
@@ -151,6 +151,7 @@ Advanced
         support_material_xy_distance
         support_material_z_distance
         support_material_z_gap_layers
+        support_air_gap
         support_material_create_internal_support
       Extruders
         support_material_extruder
diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json
index f6cae6d20..7c05fc6c8 100644
--- a/StaticData/SliceSettings/Properties.json
+++ b/StaticData/SliceSettings/Properties.json
@@ -900,6 +900,13 @@
     "DataEditType": "CHECK_BOX",
     "ExtraSettings": ""
   },
+  {
+    "SlicerConfigName": "support_air_gap",
+    "PresentationName": "Air Gap",
+    "HelpText": "The distance between the interface of support and the part. A good value is typically about 1/2 your extrusion diameter. So, between 0.0 and .2 for a .4 nozzle.",
+    "DataEditType": "POSITIVE_DOUBLE",
+    "ExtraSettings": "mm"
+  },
   {
     "SlicerConfigName": "support_material_angle",
     "PresentationName": "Starting Angle",
diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice
index 391ae4529..94f136218 160000
--- a/Submodules/MatterSlice
+++ b/Submodules/MatterSlice
@@ -1 +1 @@
-Subproject commit 391ae452986dc7446de62ff7bb82b0c74d2dd09a
+Subproject commit 94f136218ac57157ec9eb609ef3fddb548ad528c