diff --git a/config/env/torrents.js b/config/env/torrents.js
index 2f2367ba..bd6d8e67 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -9,10 +9,12 @@ module.exports = {
      *
      * @domain:                 site domain
      * @showDemoWarningPopup:   if is demo site, show warning popup whene home is opened for the first time.
+     * @cronTimeZone:           timezone of cron
      */
     app: {
       domain: 'http://chd.im:3000',
-      showDemoWarningPopup: true
+      showDemoWarningPopup: true,
+      cronTimeZone: 'Asia/Shanghai'
     },
 
     /**
@@ -247,32 +249,19 @@ module.exports = {
      *
      * settings of Hit & Run system
      *
-     * @condition:                      the condition of HnR warning, user must meet one of them before you receive the warning
-     *   @seedTime:                     torrent seed time, unit of day, default to 7 days
-     *   @ratio:                        seed ratio, default to 1.5
-     * @forbiddenWarningNumber:         when user get any warning, then can not to download some torrents
-     *   @downloadHnR:                  if user has 2 warnings, then can not to download HnR torrents
-     *   @downloadAll:                  if user has 5 warnings, then can not to download all the torrents
-     * @countWarningAtDownloadComplete: if true, system will auto set user warning tag when a torrent download complete and If the conditions are not met
-     * @countWarningAtMidnightEveryday: if true, system will run the crontab to set warning tag of all the download complete torrents
-     * @canReDownloadWarningSelf:       if true, user can redownload the warning torrent and continue seed until the warning disappears
-     * @scoreToRemoveWarning:           if user has any warning, user can remove one warning by score number, if the user has not enough score, user still can remove these
-     *                                  warning by donate the VIP class.
-     * @cronTimeZone:                   count warning crontab timezone, because need to auto count warning at midnight
+     * @condition:                          the condition of HnR warning, user must meet one of them before you receive the warning
+     *   @seedTime:                         torrent seed time, unit of day, default to 7 days
+     *   @ratio:                            seed ratio, default to 1.5
+     * @forbiddenDownloadMinWarningNumber:  when user get this number of warning, then can not to download any torrents, but can continue download the warning status torrent
+     * @scoreToRemoveWarning:               if user has any warning, user can remove one warning by score number, if the user has not enough score, user still can remove these
+     *                                      warning by donate the VIP class.
      */
     hitAndRun: {
       condition: {
         seedTime: 24 * 60 * 60 * 1000 * 7,
         ratio: 1.5
       },
-      forbiddenWarningNumber: {
-        downloadHnR: 2,
-        downloadAll: 5
-      },
-      cronTimeZone: 'Asia/Shanghai',
-      countWarningAtDownloadComplete: true,
-      countWarningAtMidnightEveryday: true,
-      canReDownloadWarningSelf: true,
+      forbiddenDownloadMinWarningNumber: 5,
       scoreToRemoveWarning: 10000
     },
     userStatus: {
diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 428f7170..be5c12dd 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -278,6 +278,7 @@ exports.announce = function (req, res) {
 
     /*---------------------------------------------------------------
      find complete torrent data
+     if not find and torrent is h&r, then create complete record
      ---------------------------------------------------------------*/
     function (done) {
       Complete.findOne({
@@ -289,18 +290,22 @@ exports.announce = function (req, res) {
             done(185);
           } else {
             if (!t) {
-              var comp = new Complete();
-              comp.torrent = req.torrent._id;
-              comp.user = req.passkeyuser._id;
+              if (t.torrent_hnr) {
+                var comp = new Complete();
+                comp.torrent = req.torrent._id;
+                comp.user = req.passkeyuser._id;
 
-              comp.save(function (err) {
-                if (err) {
-                  done(186);
-                } else {
-                  req.completeTorrent = comp;
-                  done(null);
-                }
-              });
+                comp.save(function (err) {
+                  if (err) {
+                    done(186);
+                  } else {
+                    req.completeTorrent = comp;
+                    done(null);
+                  }
+                });
+              } else {
+                done(null);
+              }
             } else {
               req.completeTorrent = t;
               done(null);
diff --git a/modules/torrents/server/models/complete.server.model.js b/modules/torrents/server/models/complete.server.model.js
index aa7df9d2..eaf2861d 100644
--- a/modules/torrents/server/models/complete.server.model.js
+++ b/modules/torrents/server/models/complete.server.model.js
@@ -108,7 +108,7 @@ function countSeedDay(t) {
  * only for completed torrents to count warning
  */
 CompleteSchema.methods.countHnRWarning = function (u) {
-  if(this.complete) {
+  if (this.complete) {
     if (this.total_seed_day >= hnrConfig.condition.seedTime || this.total_ratio >= hnrConfig.condition.ratio) {
       if (this.hnr_warning) {
         this.update({