diff --git a/README.txt b/README.txt
index 1a5579f..69c41ff 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,9 @@
 7.x-1.x RELEASE NOTE
  (Jan 17 2012) The current 7.x branch is under development and is still unstable but core features are working.
 
+ (May 23/2012) Implemented the native drupal file upload filter. Removed the option to allow/disallow files by their extension and MIME type.
+               Only support the allow option now and filter just checks the extension type.
+
 
 The Filedepot Document Management module satisfies the need for a full featured document management module supporting role or user based security.
  - Documents are saved to a directory under the Drupal Private file system to protect corporate documents for safe access and distribution.
@@ -58,18 +61,19 @@ Install
 
 3) Check that your site has the Private file system path setup.
    Filedepot uses the private file system for it's file repository and is required.
-   Typically the private file system is located outside of the website's public_html directory 
-   and this provides for a far more secure file repository since the files can not be 
+   Typically the private file system is located outside of the website's public_html directory
+   and this provides for a far more secure file repository since the files can not be
    accessed directly by a URL and there is no need to use other filesystem security like .htaccess.
 
 4) Enable the module using admin/modules
    The module will create a new content type called 'filedepot_folder'
 
 5) Review the module settings using admin/settings/filedepot
-   Save your settings and at a minium, reset to defaults and save settings.
+   Save your settings and at a minimum, reset to defaults and save settings.
+   Review the file type filtering and extension mapping - this sets the allowable files that can be uploaded and the icon that appears in the listing to be associated with the file type.
 
 6) Access the module and run create some initial folders and upload files
-   {siteurl}/index.php?q=filedepot    (/filedepot - with clean-urls on)
+   {siteurl}/index.php?q=filedepot    ({siteurl}/filedepot - with clean-urls on)
 
 7) Review the permissions assigned to your site roles: {siteurl}/index.php?q=admin/user/permissions
    Users will need atleast 'access filedepot' permission to access filedepot and to view/download files.
diff --git a/filedepot.admin.inc b/filedepot.admin.inc
index a1155e4..896bb94 100644
--- a/filedepot.admin.inc
+++ b/filedepot.admin.inc
@@ -146,31 +146,14 @@ function filedepot_admin_settings() {
     '#collapsed' => TRUE,
   );
 
-  $form['filetype_filter']['filedepot_filter_mode'] = array(
-    '#type' => 'radios',
-    '#title' => t('Use inclusion or exclusion mode'),
-    '#default_value' => variable_get('filedepot_filter_mode', 1),
-    '#options' => array(
-      '0' => t('Exclude'),
-      '1' => t('Include'),
-    ),
-    '#description' => t('Choose the way Filedepot will filter for allowable file types during upload.<br />Use exclude to allow all but selected extension:mimetypes. Use include if you want to define each file type to allow and all others will be rejected.'),
-  );
-
-  $default_filter  = 'jpg,doc,docx,xls,xlsx : application/octet-stream' . "\n";
-  $default_filter .= 'xls,xlsx: application/vnd.ms-excel' . "\n";
-  $default_filter .= 'doc: application/msword' . "\n";
-  $default_filter .= 'jpg: image/jpg' . "\n";
-
+  $default_filter  = 'jpg png doc docx xls xlsx pdf ppt pptx';
   $form['filetype_filter']['filedepot_filetype_filter'] = array(
     '#type' => 'textarea',
-    '#title' => t('File types to exclude/include'),
+    '#title' => t('File types to allow'),
     '#cols' => 60,
     '#rows' => 5,
-    '#prefix' => '<div style="margin-left:20px">',
-    '#suffix' => '</div>',
     '#default_value' => variable_get('filedepot_filetype_filter', $default_filter),
-    '#description' => t('Enter the file extension or list of extension comma seperated and then : followed by the allowable mime type for that extension(s). ') . '<strong>' . t('Only one entry per line.') . '</strong>',
+    '#description' => t('Separate extensions with a space or comma and do not include the leading dot.'),
     '#wysiwyg' => FALSE,
   );
 
@@ -260,18 +243,7 @@ function filedepot_admin_settings_validate($form, $form_state) {
   $filterdata = array();
   $rawfilefilter = $form_state['values']['filedepot_filetype_filter'];
   $filterlines = preg_split( '/\r\n|\r|\n/', $rawfilefilter );
-  foreach ($filterlines as $line) {
-    if (!empty($line)) {
-      $data = explode(':', $line);
-      $data[0] = trim($data[0]); // list of extensions
-
-      $data[1] = trim($data[1]); // mimetype
-
-      $extensions = explode(',', $data[0]);
-      $filterdata[$data[1]] = $extensions;
-    }
-  }
-  variable_set('filedepot_filetype_filterdata', serialize($filterdata));
+  variable_set('filedepot_filetype_filterdata', $filterlines);
 
   $extensiondata = array();
   $rawextensions = $form_state['values']['filedepot_extensions'];
diff --git a/filedepot.class.php b/filedepot.class.php
index 4375320..d0bb803 100644
--- a/filedepot.class.php
+++ b/filedepot.class.php
@@ -210,38 +210,6 @@ class filedepot {
     return self::$_instance;
   }
 
-  /* Function to check if passed in file extension and mimetype are in the allowed list
-   * @param        string          $ext            File extension to test
-   * @param        string          $mimetype       Mimetype to test if allowed for extension
-   * @return       Boolean                         Returns TRUE or FALSE and depends on the filter mode setting
-   */
-  function checkFilter($filename, $mimetype) {
-    $ext = end(explode(".", $filename));
-    $filterdata = unserialize(variable_get('filedepot_filetype_filterdata', ''));
-    if (is_array($filterdata) AND !empty($filterdata)) {
-      if (array_key_exists($mimetype, $filterdata) AND is_array($filterdata[$mimetype])) {
-        if (in_array($ext, $filterdata[$mimetype])) {
-          // Match found - Mimetype and extension match defined settings
-          if (variable_get('filedepot_filter_mode', FILEDEPOT_FILTER_INCLUDEMODE) == FILEDEPOT_FILTER_INCLUDEMODE) {
-            return TRUE;
-          }
-          else {
-            watchdog('filedepot',"File upload not allowed for filename: $filename, mimetype: $mimetype");
-            RETURN FALSE;
-          }
-        }
-      }
-    }
-    // If we get here, no match found. Return depends on the filtering mode
-    if (variable_get('filedepot_filter_mode', FILEDEPOT_FILTER_EXCLUDEMODE) == FILEDEPOT_FILTER_EXCLUDEMODE) {
-      return TRUE;
-    }
-    else {
-      watchdog('filedepot',"File upload not allowed for filename: $filename, mimetype: $mimetype");
-      return FALSE;
-    }
-
-  }
 
   /* Function to check if user has a particular right or permission to a folder
    *  Checks the access table for the user and any groups they belong to
diff --git a/filedepot.install b/filedepot.install
index 177f065..6f6cb60 100644
--- a/filedepot.install
+++ b/filedepot.install
@@ -276,7 +276,6 @@ function filedepot_uninstall() {
   variable_del('filedepot_pass1_recordcount');
   variable_del('filedepot_pass2_recordcount');
   variable_del('filedepot_yui_baseurl');
-  variable_del('filedepot_filter_mode');
   variable_del('filedepot_filetype_filter');
   variable_del('filedepot_filetype_filterdata');
   variable_del('filedepot_default_owner');
@@ -1282,5 +1281,16 @@ function filedepot_requirements($phase) {
   return $requirements;
 }
 
+/**
+ * Update the system variables used
+ */
+function filedepot_update_7001() {
+  // Remove the filedepot_filter_mode variable
+  variable_del('filedepot_filter_mode');
+
+  // Change the format and set the default for the allowed file type filter
+  $default_filter  = 'jpg png doc docx xls xlsx pdf ppt pptx';
+  variable_set('filedepot_filetype_filter', $default_filter);
 
+}
 
diff --git a/filedepot.module b/filedepot.module
index aae0162..85c76c1 100644
--- a/filedepot.module
+++ b/filedepot.module
@@ -1824,10 +1824,15 @@ function filedepot_newfile_form($form, &$form_state) {
 
   module_load_include('php', 'filedepot', 'lib-common');
 
+  $default_filter  = 'jpg png doc docx xls xlsx pdf ppt pptx';
+  $filter = variable_get('filedepot_filetype_filter', $default_filter);
   $form['filedepot_file'] = array(
     '#type' => 'managed_file',
     '#title' => t('Choose a file'),
     '#size' => 22,
+    '#upload_validators' => array(
+      'file_validate_extensions' => array($filter),
+    ),
   );
 
   $form['filedepot_filename'] = array(
@@ -1909,9 +1914,6 @@ function filedepot_newfile_validate($form, &$form_state) {
   else {
     $filedepot = filedepot_filedepot();
     $file = file_load($form_state['values']['filedepot_file']);
-    if ($filedepot->checkFilter($file->filename, $file->filemime) === FALSE) {
-      form_set_error('filedepot_file', t('File type not allowed'));
-    }
   }
   if ($form_state['values']['filedepot_parentfolder'] == 0) {
     form_set_error('filedepot_parentfolder', t('You must select a valid folder'));