diff --git a/README.md b/README.md
index 27351170b..f317fbcbb 100644
--- a/README.md
+++ b/README.md
@@ -193,4 +193,17 @@ Design config support. ~140 commands overall...
 ## Milestone Molt
 API 5,6 - without cluster and modules. Streams support. ~80 commands overall.
 ## Milestone Adult
-TBD.
\ No newline at end of file
+TBD.
+
+
+## Design decisions along the way
+### Expiration deadlines with relative accuracy
+I decided to limit the expiration range to 180 days. Moreover, expiration deadlines
+with millisecond precision (PEXPIRE/PSETEX etc) will be rounded to closest second
+**for deadlines greater than 16777215ms (approximately 280 minutes). In other words,
+expiries of `PEXPIRE key 10010` will expire exactly after 10 seconds and 10ms. However,
+`PEXPIRE key 16777300` will expire after 16777 seconds (i.e. 300ms earlier). Similarly,
+`PEXPIRE key 16777800` will expire after 16778 seconds, i.e. 200ms later.
+
+Such rounding has at most 0.006% error which I hope is acceptable for ranges so big.
+If you it breaks your use-cases - talk to me or open an issue and explain your case.
\ No newline at end of file
diff --git a/src/facade/error.h b/src/facade/error.h
index 4e85ad795..f04382718 100644
--- a/src/facade/error.h
+++ b/src/facade/error.h
@@ -20,6 +20,6 @@ extern const char kDbIndOutOfRangeErr[];
 extern const char kInvalidDbIndErr[];
 extern const char kScriptNotFound[];
 extern const char kAuthRejected[];
-
+extern const char kExpiryOutOfRange[];
 
 }  // namespace dfly
diff --git a/src/facade/facade.cc b/src/facade/facade.cc
index 6db9ce11f..6d8691180 100644
--- a/src/facade/facade.cc
+++ b/src/facade/facade.cc
@@ -49,6 +49,7 @@ const char kDbIndOutOfRangeErr[] = "DB index is out of range";
 const char kInvalidDbIndErr[] = "invalid DB index";
 const char kScriptNotFound[] = "-NOSCRIPT No matching script. Please use EVAL.";
 const char kAuthRejected[] = "-WRONGPASS invalid username-password pair or user is disabled.";
+const char kExpiryOutOfRange[] = "expiry is out of range";
 
 const char* RespExpr::TypeName(Type t) {
   switch (t) {
diff --git a/src/server/common_types.h b/src/server/common_types.h
index 760a1406c..ba8f47b6b 100644
--- a/src/server/common_types.h
+++ b/src/server/common_types.h
@@ -16,6 +16,8 @@ namespace dfly {
 enum class ListDir : uint8_t { LEFT, RIGHT };
 
 
+constexpr uint64_t kMaxExpireDeadlineSec = (1u << 24) - 1;
+
 using DbIndex = uint16_t;
 using ShardId = uint16_t;
 using TxId = uint64_t;
diff --git a/src/server/generic_family.cc b/src/server/generic_family.cc
index facaf81e5..caff80166 100644
--- a/src/server/generic_family.cc
+++ b/src/server/generic_family.cc
@@ -5,7 +5,7 @@
 #include "server/generic_family.h"
 
 extern "C" {
- #include "redis/object.h"
+#include "redis/object.h"
 }
 
 #include "base/logging.h"
@@ -21,6 +21,7 @@ DEFINE_uint32(dbnum, 16, "Number of databases");
 namespace dfly {
 using namespace std;
 using facade::Protocol;
+using facade::kExpiryOutOfRange;
 
 namespace {
 
@@ -244,8 +245,11 @@ void GenericFamily::Expire(CmdArgList args, ConnectionContext* cntx) {
     return OpExpire(OpArgs{shard, t->db_index()}, key, params);
   };
   OpStatus status = cntx->transaction->ScheduleSingleHop(move(cb));
-
-  (*cntx)->SendLong(status == OpStatus::OK);
+  if (status == OpStatus::OUT_OF_RANGE) {
+    return (*cntx)->SendError(kExpiryOutOfRange);
+  } else {
+    (*cntx)->SendLong(status == OpStatus::OK);
+  }
 }
 
 void GenericFamily::ExpireAt(CmdArgList args, ConnectionContext* cntx) {
@@ -263,7 +267,12 @@ void GenericFamily::ExpireAt(CmdArgList args, ConnectionContext* cntx) {
     return OpExpire(OpArgs{shard, t->db_index()}, key, params);
   };
   OpStatus status = cntx->transaction->ScheduleSingleHop(std::move(cb));
-  (*cntx)->SendLong(status == OpStatus::OK);
+
+  if (status == OpStatus::OUT_OF_RANGE) {
+    return (*cntx)->SendError(kExpiryOutOfRange);
+  } else {
+    (*cntx)->SendLong(status == OpStatus::OK);
+  }
 }
 
 void GenericFamily::Rename(CmdArgList args, ConnectionContext* cntx) {
@@ -424,7 +433,6 @@ void GenericFamily::Scan(CmdArgList args, ConnectionContext* cntx) {
   }
 }
 
-
 OpStatus GenericFamily::OpExpire(const OpArgs& op_args, string_view key,
                                  const ExpireParams& params) {
   auto& db_slice = op_args.shard->db_slice();
@@ -432,18 +440,20 @@ OpStatus GenericFamily::OpExpire(const OpArgs& op_args, string_view key,
   if (!IsValid(it))
     return OpStatus::KEY_NOTFOUND;
 
-  int64_t abs_msec = (params.unit == TimeUnit::SEC) ? params.ts * 1000 : params.ts;
+  int64_t msec = (params.unit == TimeUnit::SEC) ? params.ts * 1000 : params.ts;
+  int64_t now_msec = db_slice.Now();
+  int64_t rel_msec = params.absolute ? msec - now_msec : msec;
 
-  if (!params.absolute) {
-    abs_msec += db_slice.Now();
+  if (rel_msec > int64_t(kMaxExpireDeadlineSec * 1000)) {
+    return OpStatus::OUT_OF_RANGE;
   }
 
-  if (abs_msec <= int64_t(db_slice.Now())) {
+  if (rel_msec <= 0) {
     CHECK(db_slice.Del(op_args.db_ind, it));
   } else if (IsValid(expire_it)) {
-    expire_it->second = abs_msec;
+    expire_it->second = rel_msec + now_msec;
   } else {
-    db_slice.Expire(op_args.db_ind, it, abs_msec);
+    db_slice.Expire(op_args.db_ind, it, rel_msec + now_msec);
   }
 
   return OpStatus::OK;
@@ -491,8 +501,8 @@ OpResult<uint32_t> GenericFamily::OpExists(const OpArgs& op_args, ArgSlice keys)
   return res;
 }
 
-OpResult<void> GenericFamily::OpRen(const OpArgs& op_args, string_view from,
-                                    string_view to, bool skip_exists) {
+OpResult<void> GenericFamily::OpRen(const OpArgs& op_args, string_view from, string_view to,
+                                    bool skip_exists) {
   auto& db_slice = op_args.shard->db_slice();
   auto [from_it, expire_it] = db_slice.FindExt(op_args.db_ind, from);
   if (!IsValid(from_it))
@@ -538,8 +548,8 @@ void GenericFamily::OpScan(const OpArgs& op_args, uint64_t* cursor, vector<strin
     ++cnt;
   };
 
-  VLOG(1) << "PrimeTable " << db_slice.shard_id() << "/" << op_args.db_ind
-          << " has " << db_slice.DbSize(op_args.db_ind);
+  VLOG(1) << "PrimeTable " << db_slice.shard_id() << "/" << op_args.db_ind << " has "
+          << db_slice.DbSize(op_args.db_ind);
 
   uint64_t cur = *cursor;
   auto [prime_table, expire_table] = db_slice.GetTables(op_args.db_ind);
@@ -559,10 +569,10 @@ void GenericFamily::Register(CommandRegistry* registry) {
   constexpr auto kSelectOpts = CO::LOADING | CO::FAST | CO::NOSCRIPT;
 
   *registry << CI{"DEL", CO::WRITE, -2, 1, -1, 1}.HFUNC(Del)
-    /* Redis compaitibility:
-     * We don't allow PING during loading since in Redis PING is used as
-     * failure detection, and a loading server is considered to be
-     * not available. */
+            /* Redis compaitibility:
+             * We don't allow PING during loading since in Redis PING is used as
+             * failure detection, and a loading server is considered to be
+             * not available. */
             << CI{"PING", CO::FAST, -1, 0, 0, 0}.HFUNC(Ping)
             << CI{"ECHO", CO::LOADING | CO::FAST, 2, 0, 0, 0}.HFUNC(Echo)
             << CI{"EXISTS", CO::READONLY | CO::FAST, -2, 1, -1, 1}.HFUNC(Exists)
diff --git a/src/server/list_family.cc b/src/server/list_family.cc
index b74875020..045333f9e 100644
--- a/src/server/list_family.cc
+++ b/src/server/list_family.cc
@@ -32,11 +32,11 @@ extern "C" {
  * but if your use case is unique, adjust the settings as necessary.
  *
  */
-DEFINE_int32(list_max_listpack_size, -2, "Maximum ziplist size, default is 8kb");
+DEFINE_int32(list_max_listpack_size, -2, "Maximum listpack size, default is 8kb");
 
 /**
  * Lists may also be compressed.
- * Compress depth is the number of quicklist ziplist nodes from *each* side of
+ * Compress depth is the number of quicklist listpack nodes from *each* side of
  * the list to *exclude* from compression.  The head and tail of the list
  * are always uncompressed for fast push/pop operations.  Settings are:
  * 0: disable all list compression
diff --git a/src/server/string_family.cc b/src/server/string_family.cc
index fb5dda7b5..4c8c73713 100644
--- a/src/server/string_family.cc
+++ b/src/server/string_family.cc
@@ -123,13 +123,17 @@ void StringFamily::Set(CmdArgList args, ConnectionContext* cntx) {
       if (!absl::SimpleAtoi(ex, &int_arg)) {
         return builder->SendError(kInvalidIntErr);
       }
-      if (int_arg <= 0 || (!is_ms && int_arg >= 500000000)) {
-        return builder->SendError("invalid expire time in set");
+
+      if (int_arg <= 0 || (!is_ms && int_arg >= int64_t(kMaxExpireDeadlineSec))) {
+        return builder->SendError(facade::kExpiryOutOfRange);
       }
 
       if (!is_ms) {
         int_arg *= 1000;
       }
+      if (int_arg >= int64_t(kMaxExpireDeadlineSec * 1000)) {
+        return builder->SendError(facade::kExpiryOutOfRange);
+      }
       sparams.expire_after_ms = int_arg;
     } else if (cur_arg == "NX") {
       sparams.how = SetCmd::SET_IF_NOTEXIST;