diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 799ed532..05329746 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,12 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 0eae086f..528de1c2 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1223;
+    public static final int version = 1224;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java b/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java
index 57b31d60..7030bbb0 100644
--- a/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java
+++ b/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java
@@ -11,6 +11,6 @@ public class ShowCurrentSAPFORConfigurationTests extends ShowCurrentConfiguratio
     protected void showDone() throws Exception {
         Global.testingServer.db.groups.getUI().SelectKeys(Global.testingServer.db.getSapforConfigurationGroupsIds(target));
         Global.testingServer.db.tests.getUI().SelectKeys(Global.testingServer.db.getSapforConfigurationTestsIds(target));
-        Global.testingServer.db.dvmSettings.getUI().SelectKeys(Global.testingServer.db.getSapforConfigurationSettingsIds(target));
+        Global.testingServer.db.sapforSettings.getUI().SelectKeys(Global.testingServer.db.getSapforConfigurationSettingsIds(target));
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java
index 6aa6f6a8..64f77bbe 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java
@@ -36,5 +36,6 @@ public class DVMConfigurationDialog extends DBObjectDialog<DVMConfiguration, DVM
         fields.sCompilationMaxtime.setEnabled(false);
         fields.sRunMaxtime.setEnabled(false);
         fields.sKernels.setEnabled(false);
+        fields.cbGroupsOnly.setEnabled(false);
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java
index edb126de..91d9b8bf 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java
@@ -20,15 +20,18 @@ public class SapforConfigurationDialog extends DBObjectDialog<SapforConfiguratio
     public void fillFields() {
         fields.tfName.setText(Result.description);
         fields.sKernels.setValue(Result.kernels);
+        fields.cbGroupsOnly.setSelected(Result.groupsOnly != 0);
     }
     @Override
     public void ProcessResult() {
         Result.description = fields.tfName.getText();
         Result.kernels = (int) fields.sKernels.getValue();
+        Result.groupsOnly = fields.cbGroupsOnly.isSelected() ? 1 : 0;
     }
     @Override
     public void SetReadonly() {
         fields.tfName.setEnabled(false);
         fields.sKernels.setEnabled(false);
+        fields.cbGroupsOnly.setEnabled(false);
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form
index 340d6257..ca03152f 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.form
@@ -8,7 +8,7 @@
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="d1d6e" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="d1d6e" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -29,7 +29,7 @@
           </component>
           <vspacer id="224d6">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
                 <preferred-size width="99" height="14"/>
               </grid>
             </constraints>
@@ -66,6 +66,19 @@
             </constraints>
             <properties/>
           </component>
+          <component id="23997" class="javax.swing.JCheckBox" binding="cbGroupsOnly">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <font name="Times New Roman" size="16" style="2"/>
+              <horizontalAlignment value="0"/>
+              <icon value="Common/icons/NotPick.png"/>
+              <selectedIcon value="Common/icons/Pick.png"/>
+              <text value="учитывать только группы"/>
+              <toolTipText value="При формировании пакета, брать все тест из входящих групп"/>
+            </properties>
+          </component>
         </children>
       </grid>
     </children>
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
index 1a0810b4..ad31caad 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationFields.java
@@ -10,6 +10,7 @@ public class SapforConfigurationFields implements DialogFields {
     public JSpinner sTransformationMaxtime;
     public JSpinner sKernels;
     private JPanel content;
+    public JCheckBox cbGroupsOnly;
     public SapforConfigurationFields() {
         sKernels.setModel(new SpinnerNumberModel(1, 1,
                 Constants.testingMaxKernels,