--- formfilter.module
+++ formfilter.module
@@ -46,6 +46,14 @@
     '#options' => array(t('Disabled'), t('Enabled')),
     '#description' => 'Simplify the node form by pulling the <em>Promote</em> and <em>Sticky</em> options out of fieldsets and then putting all the fieldsets in one <em>Advanced options</em> fieldset.',
   );
+  if (module_exists('content')){
+    $form['formfilter_simplify_node_cck'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Exclude CCK fieldsets from <em>Advanced options</em>'),
+      '#description' => t('Prevents custom CCK fieldsets from being placed under the <em>Advanced options</em> fieldset.'),
+      '#default_value' => variable_get('formfilter_simplify_node_cck', 1),
+    );
+  }
   return system_settings_form($form);
 }
 
@@ -119,10 +127,20 @@
       '#title' => 'Advanced options',
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
+      '#weight' => 100,
     );
     // ...and move all first-level fieldsets there.
     foreach (element_children($form) as $key) {
-      if (!(in_array($key, array('advanced', 'taxonomy'))) && $form[$key]['#type'] && $form[$key]['#type'] == 'fieldset') {
+      //test for cck fieldset option and cck fieldset presence
+      $cck_fieldset = false;
+      if (module_exists('content')) {
+        if (variable_get('formfilter_simplify_node_cck', 1)) {
+          if (strpos($key, 'group_') !== false) {
+            $cck_fieldset = true;
+          }
+        }
+      }
+      if (!(in_array($key, array('advanced', 'taxonomy'))) && !($cck_fieldset) && $form[$key]['#type'] && $form[$key]['#type'] == 'fieldset') {
         $form['advanced'][$key] = $form[$key];
         unset($form[$key]);
       }