Index: trunk/BNC/src/combination/bnccomb.cpp
===================================================================
--- trunk/BNC/src/combination/bnccomb.cpp	(revision 10096)
+++ trunk/BNC/src/combination/bnccomb.cpp	(revision 10098)
@@ -454,12 +454,4 @@
     }
 
-    // Check regarding current time
-    // ----------------------------
-    if ((newClk->_time >= currentTime) ||        // future time stamp
-        (currentTime - newClk->_time) > 60.0) {  // very old data sets
-      delete newClk;
-      continue;
-    }
-
     // Check Modulo Time
     // -----------------
@@ -487,4 +479,18 @@
     }
 
+    // Check regarding current time
+    // ----------------------------
+    if ((newClk->_time >= currentTime) ||        // future time stamp
+        (currentTime - newClk->_time) > 120.0) {  // very old data sets
+#ifdef BNC_DEBUG_CMB
+      emit newMessage("bncComb: very old data sets: " + acName.toLatin1() + " " + newClk->_prn.toString().c_str() +
+          QString(" %1 ").arg(newClk->_time.timestr().c_str()).toLatin1() + "vs. current time" +
+          QString(" %1 ").arg(currentTime.timestr().c_str()).toLatin1(), true);
+#endif
+      delete newClk;
+      continue;
+    }
+
+
     // Set the last time
     // -----------------
@@ -535,5 +541,5 @@
   // Make sure the buffer does not grow beyond any limit
   // ---------------------------------------------------
-  const unsigned MAX_EPODATA_SIZE = 10;
+  const unsigned MAX_EPODATA_SIZE = 25;
   if (_epoClkData.size() > MAX_EPODATA_SIZE) {
     delete _epoClkData.front();
@@ -553,5 +559,5 @@
     bncTime epoTime = _epoClkData.front()->_time;
 
-    if ((currentTime - epoTime) > 60.0) {
+    if ((currentTime - epoTime) > 120.0) {
       delete _epoClkData.front();
       _epoClkData.pop_front();