diff --git a/com-dict-client/package.json b/com-dict-client/package.json
index c1819a1..e5e5151 100644
--- a/com-dict-client/package.json
+++ b/com-dict-client/package.json
@@ -12,6 +12,7 @@
     "firebase-functions": "^3.8.0",
     "puppeteer": "^5.2.1",
     "react": "^16.13.1",
+    "react-calendar": "^4.0.0",
     "react-dom": "^16.13.1",
     "react-instantsearch-dom": "^6.7.0",
     "react-redux": "^7.2.0",
diff --git a/com-dict-client/src/components/AddWord/index.js b/com-dict-client/src/components/AddWord/index.js
index 77dde09..7789d6f 100644
--- a/com-dict-client/src/components/AddWord/index.js
+++ b/com-dict-client/src/components/AddWord/index.js
@@ -11,6 +11,9 @@ import {
   message,
 } from "antd";
 import WordClass from "./WordClass";
+
+import Calendar from "react-calendar";
+import "react-calendar/dist/Calendar.css";
 import EditableTagGroup from "./RelatedWords";
 
 import { useFirestore, useFirestoreConnect } from "react-redux-firebase";
@@ -45,6 +48,13 @@ function WordForm() {
   const onSubmit = (values) => {
     // const definition = values;
     // console.log(definition);
+    var dateString = null;
+    if (checked) {
+      dateString = new Date(date.getTime() - date.getTimezoneOffset() * 60000)
+        .toISOString()
+        .split("T")[0];
+    }
+
     const data = {
       other_language: language,
       head_term: headTerm,
@@ -60,7 +70,7 @@ function WordForm() {
       uname: user.displayName,
       createdAt: new Date().getTime(),
       alphabatical: headTerm[0].toUpperCase(),
-      word_of_the_day: null,
+      word_of_the_day: dateString,
       pronunciation: null,
       trending_factor: 0,
     };
@@ -68,6 +78,9 @@ function WordForm() {
     return addWord(data)(firestore);
   };
 
+  const [date, setDate] = useState(new Date());
+  const [checked, setChecked] = React.useState(false);
+
   const categories = useSelector((state) => state.firestore.ordered.categories);
 
   const headTerms = useSelector((state) => state.firestore.ordered.headTerms);
@@ -87,7 +100,9 @@ function WordForm() {
     console.log(newHdTm);
     addHeadTerm(newHdTm)(firestore, setHeadTerm);
   };
-
+  const handleChange = () => {
+    setChecked(!checked);
+  };
   return (
     <div>
       <Row>
@@ -244,6 +259,27 @@ function WordForm() {
                 <Row>
                   <Col xl={6} ls={6} md={3} sm={0} xs={0}></Col>
                   <Col xl={12} lg={12} md={18} sm={24} xs={24}>
+                    <div>
+                      <label>
+                        <input
+                          type="checkbox"
+                          checked={checked}
+                          onChange={handleChange}
+                        />
+                        Word of the Day?
+                      </label>
+                    </div>
+                    {checked && (
+                      <div className="app">
+                        <h1 className="header">Select Date</h1>
+                        <div className="calendar-container">
+                          <Calendar onChange={setDate} value={date} />
+                        </div>
+                        <div className="text-center">
+                          Selected date: {date.toDateString()}
+                        </div>
+                      </div>
+                    )}
                     <Button
                       type="primary"
                       // size="large"
diff --git a/com-dict-client/src/components/WordHome/index.js b/com-dict-client/src/components/WordHome/index.js
index 05f458f..b8d108b 100644
--- a/com-dict-client/src/components/WordHome/index.js
+++ b/com-dict-client/src/components/WordHome/index.js
@@ -26,7 +26,7 @@ function WordHome() {
           // let lastItem = "";
           const defs = [];
           querySnapshot.docs.filter((doc) => {
-            if (doc.data().word_of_the_day) {
+            if (Date.parse(doc.data().word_of_the_day)<Date.parse(moment().format("YYYY-MM-DD"))) {
               // lastItem = doc.id;
               let tempObj = {};
               tempObj = doc.data();