diff --git a/apps/i2psnark/java/src/org/klomp/snark/BandwidthManager.java b/apps/i2psnark/java/src/org/klomp/snark/BandwidthManager.java
index 684da839775411c45d99af677fbeda3fff3173da..bd5f45042b6c1149759f1c87941978ac905bd7ff 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/BandwidthManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/BandwidthManager.java
@@ -22,7 +22,7 @@ import net.i2p.util.SyntheticREDQueue;
  *  and current moving averages of up, down, and requested bandwidth.
  *
  *  At the lower layers, simple weighted moving averages of
- *  three buckets of 40 seconds each (2 minutes total) are used
+ *  three buckets of time PeerCoordinator.CHECK_PERIOD each are used
  *  for up and down, and requested is delegated here.
  *
  *  The lower layers must report to the next-higher layer.
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
index 1253b16e7093471039074f85f0f2d4a6c91de912..959ba7fe0a4f5eb34657065041631f0208deb225 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
@@ -78,7 +78,7 @@ public class Peer implements Comparable<Peer>, BandwidthListener
   private final long _id;
   private final AtomicBoolean _disconnected = new AtomicBoolean();
 
-  final static long CHECK_PERIOD = PeerCoordinator.CHECK_PERIOD; // 40 seconds
+  final static long CHECK_PERIOD = PeerCoordinator.CHECK_PERIOD;
   final static int RATE_DEPTH = PeerCoordinator.RATE_DEPTH; // make following arrays RATE_DEPTH long
   private final long uploaded_old[] = {-1,-1,-1};
   private final long downloaded_old[] = {-1,-1,-1};
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
index 3ec0b32ff6a6592bea0bebd77d8d754600d3c56c..b4126fb8eda7051f6732aafdeb13666b0458efad 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
@@ -73,7 +73,7 @@ class PeerCoordinator implements PeerListener, BandwidthListener
   private final Snark snark;
 
   // package local for access by CheckDownLoadersTask
-  final static long CHECK_PERIOD = 40*1000; // 40 seconds
+  final static long CHECK_PERIOD = 30*1000;
   final static int MAX_UPLOADERS = 8;
   public static final long MAX_INACTIVE = 8*60*1000;
   public static final long MAX_SEED_INACTIVE = 2*60*1000;