diff --git a/src/components/Card/CardWithoutPicture.jsx b/src/components/Card/CardWithoutPicture.jsx
index abc4ecb0..13048494 100644
--- a/src/components/Card/CardWithoutPicture.jsx
+++ b/src/components/Card/CardWithoutPicture.jsx
@@ -161,14 +161,18 @@ export default function CardWithoutPicture({ tutorial }) {
         </CardContent>
       </Link>
       <CardActions className={classes.settings} disableSpacing>
-        <Chip
-          label="HTML"
-          component="a"
-          href="#chip"
-          clickable
-          variant="outlined"
-          className={classes.margin}
-        />
+        {tutorial?.tut_tags &&
+          tutorial?.tut_tags.map((tag, index) => (
+            <Chip
+              label={tag}
+              key={index}
+              component="a"
+              href="#chip"
+              clickable
+              variant="outlined"
+              className={classes.margin}
+            />
+          ))}
         <Typography
           variant="overline"
           display="block"
diff --git a/src/components/CodelabCard/index.jsx b/src/components/CodelabCard/index.jsx
index 74575bf8..c209dde7 100644
--- a/src/components/CodelabCard/index.jsx
+++ b/src/components/CodelabCard/index.jsx
@@ -53,9 +53,7 @@ const CardComponent = ({
                       className={classes.logoImg}
                     />
                     <img
-                      src={
-                        require(`../../../assets/images/${profilePic}`).default
-                      }
+                      src={require(`../../assets/images/${profilePic}`).default}
                       alt=""
                       height="20rem"
                       width="20rem"
@@ -65,7 +63,7 @@ const CardComponent = ({
                 </Grid>
               ) : (
                 <img
-                  src={require(`../../../assets/images/${profilePic}`).default}
+                  src={require(`../../assets/images/${profilePic}`).default}
                   alt=""
                   className={classes.avatar}
                 />
diff --git a/src/components/HomePage/index.jsx b/src/components/HomePage/index.jsx
index e8190e6b..e716f6ca 100644
--- a/src/components/HomePage/index.jsx
+++ b/src/components/HomePage/index.jsx
@@ -37,13 +37,17 @@ import {
   getTutorialFeedData,
   getTutorialFeedIdArray
 } from "../../store/actions/tutorialPageActions";
+import { getTutorialsByTopTags } from "../../store/actions";
 
 function HomePage({ background = "white", textColor = "black" }) {
   const classes = useStyles();
   const dispatch = useDispatch();
   const firebase = useFirebase();
   const firestore = useFirestore();
-  const [value, setValue] = useState(2);
+  const tutorialFeedArray = useSelector(
+    ({ tutorialPage }) => tutorialPage.feed.homepageFeedArray
+  );
+  const [tutorials, setTutorials] = useState(tutorialFeedArray);
   const [selectedTab, setSelectedTab] = useState("1");
   const [visibleModal, setVisibleModal] = useState(false);
   const [footerContent, setFooterContent] = useState([
@@ -57,7 +61,7 @@ function HomePage({ background = "white", textColor = "black" }) {
       link: "https://dev.codelabz.io/"
     }
   ]);
-
+  let tutorialIdArray;
   const windowSize = useWindowSize();
   const [openMenu, setOpen] = useState(false);
   const toggleSlider = () => {
@@ -167,7 +171,7 @@ function HomePage({ background = "white", textColor = "black" }) {
   const profileData = useSelector(({ firebase: { profile } }) => profile);
   useEffect(() => {
     const getFeed = async () => {
-      const tutorialIdArray = await getTutorialFeedIdArray(profileData.uid)(
+      tutorialIdArray = await getTutorialFeedIdArray(profileData.uid)(
         firebase,
         firestore,
         dispatch
@@ -176,18 +180,46 @@ function HomePage({ background = "white", textColor = "black" }) {
     };
     getFeed();
   }, []);
-  const tutorials = useSelector(
-    ({
-      tutorialPage: {
-        feed: { homepageFeedArray }
-      }
-    }) => homepageFeedArray
-  );
 
   const notification = () => {};
-  const handleChange = (event, newValue) => {
-    setValue(newValue);
+
+  const convertToDate = timestamp => {
+    return new Date(timestamp.seconds * 1000);
   };
+
+  const handleFeedChange = async filterType => {
+    let filteredTutorials;
+    switch (filterType) {
+      case "Featured":
+        filteredTutorials = await getTutorialsByTopTags()(
+          firebase,
+          firestore,
+          dispatch
+        );
+        break;
+      case "New":
+        await fetchNewTutorials();
+        filteredTutorials = [...tutorialFeedArray].sort(
+          (a, b) => convertToDate(b.createdAt) - convertToDate(a.createdAt)
+        );
+        break;
+      case "Top":
+        await fetchNewTutorials();
+        filteredTutorials = [...tutorialFeedArray].sort(
+          (a, b) => b.upVotes - a.upVotes
+        );
+        break;
+      default:
+        filteredTutorials = tutorials;
+    }
+
+    setTutorials(filteredTutorials);
+  };
+
+  const fetchNewTutorials = async () => {
+    await getTutorialFeedData(tutorialIdArray)(firebase, firestore, dispatch);
+  };
+
   const handleTabChange = (event, newValue) => {
     setSelectedTab(newValue);
   };
@@ -234,7 +266,7 @@ function HomePage({ background = "white", textColor = "black" }) {
             onSidebarClick={e => closeModal(e)}
           />
           <Card className={classes.card}>
-            <Activity />
+            <Activity handleFeedChange={handleFeedChange} />
           </Card>
           <Box item sx={{ display: { md: "none" } }}>
             <TagCard tags={tags} />
diff --git a/src/components/MyFeed/DiscoverCodelabz/CodelabzCarousel.jsx b/src/components/MyFeed/DiscoverCodelabz/CodelabzCarousel.jsx
index 67fe28c7..d53c428d 100644
--- a/src/components/MyFeed/DiscoverCodelabz/CodelabzCarousel.jsx
+++ b/src/components/MyFeed/DiscoverCodelabz/CodelabzCarousel.jsx
@@ -20,7 +20,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { useFirestore, useFirebase } from "react-redux-firebase";
 import Default from "../../../assets/images/logo.jpeg";
 import { Link } from "react-router-dom";
-import { clearOrgData, getLaunchedOrgsData } from "../../../store/actions";
+import { getTutorialsByTopTags } from "../../../store/actions";
 import {
   getTutorialFeedIdArray,
   getTutorialFeedData
@@ -52,10 +52,10 @@ const useStyles = makeStyles(theme => ({
 
 const CodelabzCarousel = ({ sortBy }) => {
   const classes = useStyles();
-
-  const tutorials = useSelector(
+  const tutorialFeedArray = useSelector(
     ({ tutorialPage }) => tutorialPage.feed.homepageFeedArray
-  ) || [0, 0, 0, 0, 0, 0];
+  );
+  const [tutorials, setTutorials] = useState(tutorialFeedArray);
   const profileData = useSelector(({ firebase: { profile } }) => profile);
   const dispatch = useDispatch();
   const firestore = useFirestore();
@@ -74,23 +74,51 @@ const CodelabzCarousel = ({ sortBy }) => {
     return () => {};
   }, [firestore, dispatch]);
 
-  console.log(tutorials);
+  useEffect(() => {
+    handleFeedChange(sortBy);
+  }, [sortBy, tutorialFeedArray]);
+
+  const convertToDate = createdAt => {
+    return new Date(createdAt.seconds * 1000);
+  };
+
+  const handleFeedChange = async filterType => {
+    let filteredTutorials;
+    const oneMonthAgo = new Date().setMonth(new Date().getMonth() - 1);
+    const twoWeeksAgo = new Date().setDate(new Date().getDate() - 14);
 
-  const getTitle = () => {
-    switch (sortBy) {
+    switch (filterType) {
       case "trending":
-        return "Trending Now";
-      case "featured":
-        return "Featured on Codelabz";
+        filteredTutorials = [...tutorials]
+          .filter(tutorial => convertToDate(tutorial.createdAt) > twoWeeksAgo)
+          .sort((a, b) => b.upVotes - a.upVotes);
+        break;
       case "best":
-        return "Best of this month";
+        filteredTutorials = [...tutorials]
+          .filter(tutorial => convertToDate(tutorial.createdAt) > oneMonthAgo)
+          .sort((a, b) => b.upVotes - a.upVotes);
+        break;
+      case "Featured":
+        filteredTutorials = await getTutorialsByTopTags()(
+          firebase,
+          firestore,
+          dispatch
+        );
+        break;
+      default:
+        filteredTutorials = tutorials;
     }
+
+    setTutorials(filteredTutorials);
   };
+
   return (
     <>
       <Paper variant="outlined" className={classes.container}>
         <Typography variant="h4" className={classes.heading}>
-          {getTitle()}
+          {sortBy === "trending" && "Trending Now"}
+          {sortBy === "best" && "Best of the Month"}
+          {sortBy === "featured" && "Featured on Codelabz"}
         </Typography>
         <Swiper
           modules={[Navigation]}
@@ -101,9 +129,9 @@ const CodelabzCarousel = ({ sortBy }) => {
           spaceBetween={20}
           style={{ padding: "20px 20px" }}
         >
-          {tutorials.map((tutorial, i) => {
-            return tutorial == 0 ? (
-              <SwiperSlide>
+          {tutorials.map((tutorial, i) => (
+            <SwiperSlide key={i}>
+              {!tutorial ? (
                 <Paper variant="outlined" className={classes.root}>
                   <Skeleton
                     variant="rectangular"
@@ -114,9 +142,7 @@ const CodelabzCarousel = ({ sortBy }) => {
                   <Skeleton width={"100%"} height={"25px"} />
                   <Skeleton width={"60%"} height={"25px"} />
                 </Paper>
-              </SwiperSlide>
-            ) : (
-              <SwiperSlide>
+              ) : (
                 <Link to={`/tutorial/${tutorial?.tutorial_id}`}>
                   <Paper variant="outlined" className={classes.root}>
                     <CardActionArea>
@@ -152,9 +178,9 @@ const CodelabzCarousel = ({ sortBy }) => {
                     </CardActionArea>
                   </Paper>
                 </Link>
-              </SwiperSlide>
-            );
-          })}
+              )}
+            </SwiperSlide>
+          ))}
         </Swiper>
       </Paper>
     </>
diff --git a/src/components/Topbar/Activity/ActivityList.jsx b/src/components/Topbar/Activity/ActivityList.jsx
index 742aefca..562126ad 100644
--- a/src/components/Topbar/Activity/ActivityList.jsx
+++ b/src/components/Topbar/Activity/ActivityList.jsx
@@ -28,7 +28,7 @@ const useStyles = makeStyles(theme => ({
   }
 }));
 
-function ActivityList({ value, toggle, acitvitylist, classname }) {
+function ActivityList({ value, toggle, activityList, classname }) {
   const classes = useStyles();
 
   return (
@@ -36,7 +36,7 @@ function ActivityList({ value, toggle, acitvitylist, classname }) {
       <Grid container spacing={2} className={classname}>
         <Grid item xs={12}>
           <Stack spacing={2} direction={"row"}>
-            {acitvitylist.map((item, index) => (
+            {activityList.map((item, index) => (
               <Button
                 variant="outlined"
                 color="primary"
diff --git a/src/components/Topbar/Activity/index.jsx b/src/components/Topbar/Activity/index.jsx
index ae6199c2..d16a2b6a 100644
--- a/src/components/Topbar/Activity/index.jsx
+++ b/src/components/Topbar/Activity/index.jsx
@@ -18,11 +18,11 @@ const useStyles = makeStyles(theme => ({
   }
 }));
 
-function Activity() {
+function Activity({ handleFeedChange }) {
   const classes = useStyles();
   const [List, setList] = useState(1);
 
-  const acitvitylist = [
+  const activityList = [
     {
       id: 1,
       icon: LocalOfferIcon,
@@ -52,8 +52,9 @@ function Activity() {
               value={List}
               toggle={item => {
                 setList(item.id);
+                handleFeedChange(activityList[item.id - 1].text);
               }}
-              acitvitylist={acitvitylist}
+              activityList={activityList}
             />
           </Grid>
         </div>
diff --git a/src/components/TutorialPage/components/PostDetails.jsx b/src/components/TutorialPage/components/PostDetails.jsx
index 1c46ac63..80644ac2 100644
--- a/src/components/TutorialPage/components/PostDetails.jsx
+++ b/src/components/TutorialPage/components/PostDetails.jsx
@@ -87,7 +87,7 @@ const PostDetails = ({ details }) => {
                 <Grid item>
                   <Typography sx={{ fontWeight: "700", fontSize: "1.2rem" }}>
                     {details?.title}
-                    {details?.tag?.map(tag => (
+                    {details?.tags?.map(tag => (
                       <Chip
                         label={tag}
                         variant="outlined"
diff --git a/src/components/TutorialPage/components/Thumbnails.jsx b/src/components/TutorialPage/components/Thumbnails.jsx
index 89c6bc04..b1528ec5 100644
--- a/src/components/TutorialPage/components/Thumbnails.jsx
+++ b/src/components/TutorialPage/components/Thumbnails.jsx
@@ -1,3 +1,4 @@
+import React from "react";
 import { Box, Grid, Avatar, Typography, Card } from "@mui/material";
 import { makeStyles } from "@mui/styles";
 
@@ -18,34 +19,39 @@ const useStyles = makeStyles(() => ({
 
 const Thumbnails = ({ tutorial }) => {
   const classes = useStyles();
+
   return (
     <>
       <Card className={classes.container}>
         <Grid container direction="column" rowSpacing={1}>
           <Grid item className={classes.profile}>
             <Avatar sx={{ height: "22px", width: "22px", fontSize: "12px" }}>
-              A
+              {tutorial?.created_by?.charAt(0) || "U"}
             </Avatar>
             <Typography>
-              <span className={classes.bold}>Abhishek</span> From{" "}
-              <span className={classes.bold}>Codelabz</span>
+              <span className={classes.bold}>
+                {tutorial?.created_by || "Unknown"}
+              </span>{" "}
+              From{" "}
+              <span className={classes.bold}>
+                {tutorial?.owner || "Unknown"}
+              </span>
             </Typography>
           </Grid>
           <Grid item container justifyContent="center">
             <Grid item container direction="column" xs={9}>
               <Grid item>
                 <Typography sx={{ fontWeight: "600", fontSize: "11px" }}>
-                  How to build a microservice design and architecture using
-                  proper tools
+                  {tutorial?.summary || "No summary available"}
                 </Typography>
               </Grid>
             </Grid>
-            <Grid item xs={3}>
+            {/* <Grid item xs={3}>
               <img
                 src="https://cdn-images-1.medium.com/v2/resize:fit:1080/1*SBH_Y5t32ixv8C_F1MVYzA.png"
                 alt=""
               />
-            </Grid>
+            </Grid> */}
           </Grid>
         </Grid>
       </Card>
diff --git a/src/components/TutorialPage/components/sideBar.jsx b/src/components/TutorialPage/components/sideBar.jsx
index 8a56b8fc..be9297fd 100644
--- a/src/components/TutorialPage/components/sideBar.jsx
+++ b/src/components/TutorialPage/components/sideBar.jsx
@@ -1,6 +1,9 @@
+import React, { useState, useEffect } from "react";
 import { Box, Grid, Typography, Button } from "@mui/material";
 import Thumbnails from "./Thumbnails";
 import { makeStyles } from "@mui/styles";
+import { getRecommendedTutorials } from "../../../store/actions";
+import { useFirebase, useFirestore } from "react-redux-firebase";
 
 const useStyles = makeStyles(() => ({
   container: {
@@ -19,14 +22,37 @@ const useStyles = makeStyles(() => ({
       "linear-gradient(180deg, rgba(255, 255, 255, 0.00) 0%, #FFF 100%)"
   }
 }));
-const SideBar = () => {
+const SideBar = ({ currentTutorial }) => {
   const classes = useStyles();
+  const [tutorials, setTutorials] = useState([]);
+  const firebase = useFirebase();
+  const firestore = useFirestore();
+
+  useEffect(() => {
+    const fetchRecommendedTutorials = async () => {
+      try {
+        const recommendedTutorials = await getRecommendedTutorials(
+          currentTutorial?.tags
+        )(firebase, firestore);
+        setTutorials(
+          recommendedTutorials.filter(
+            tutorial => tutorial.tutorial_id !== currentTutorial?.id
+          )
+        );
+      } catch (error) {
+        console.error("Error fetching recommended tutorials:", error);
+      }
+    };
+
+    fetchRecommendedTutorials();
+  }, [currentTutorial?.tags]);
+
   return (
     <>
       <Box className={classes.container}>
-        <div className={classes.load}>
+        {/* <div className={classes.load}>
           <Button sx={{ textTransform: "none" }}>Show More &darr;</Button>
-        </div>
+        </div> */}
         <Grid container direction="column">
           <Typography
             sx={{
@@ -38,13 +64,14 @@ const SideBar = () => {
           >
             More From Codelabz
           </Typography>
-          <Thumbnails />
-          <Thumbnails />
-          <Thumbnails />
+          {tutorials.length > 0 &&
+            tutorials.map((tutorial, index) => (
+              <Thumbnails key={index} tutorial={tutorial} />
+            ))}
         </Grid>
       </Box>
       <Box className={classes.container}>
-        <div className={classes.load}>
+        {/* <div className={classes.load}>
           <Button sx={{ textTransform: "none" }}>Show More &darr;</Button>
         </div>
         <Grid container direction="column">
@@ -61,7 +88,7 @@ const SideBar = () => {
           <Thumbnails />
           <Thumbnails />
           <Thumbnails />
-        </Grid>
+        </Grid> */}
       </Box>
     </>
   );
diff --git a/src/components/TutorialPage/index.jsx b/src/components/TutorialPage/index.jsx
index dd7895c2..4a0e4a98 100644
--- a/src/components/TutorialPage/index.jsx
+++ b/src/components/TutorialPage/index.jsx
@@ -51,13 +51,14 @@ function TutorialPage({ background = "white", textColor = "black" }) {
   );
 
   const postDetails = {
+    id: tutorial?.tutorial_id,
     title: tutorial?.title,
     org: tutorial?.owner,
     user: tutorial?.created_by,
     upVote: tutorial?.upVotes,
     downVote: tutorial?.downVotes,
     published_on: tutorial?.createdAt,
-    tag: tutorial?.tut_tags
+    tags: tutorial?.tut_tags
   };
 
   const steps = useSelector(
@@ -121,7 +122,7 @@ function TutorialPage({ background = "white", textColor = "black" }) {
           xs={3}
           data-testId="tutorialpageSideBar"
         >
-          <SideBar />
+          <SideBar currentTutorial={postDetails} />
         </Grid>
       </Grid>
     </Box>
diff --git a/src/components/Tutorials/NewTutorial/index.jsx b/src/components/Tutorials/NewTutorial/index.jsx
index ac826889..3e5754ee 100644
--- a/src/components/Tutorials/NewTutorial/index.jsx
+++ b/src/components/Tutorials/NewTutorial/index.jsx
@@ -5,7 +5,7 @@ import { createTutorial } from "../../../store/actions";
 import { useFirebase, useFirestore } from "react-redux-firebase";
 import { useHistory } from "react-router-dom";
 import Button from "@mui/material/Button";
-import { Alert, Box } from "@mui/material";
+import { Alert, Box, Chip } from "@mui/material";
 import TextField from "@mui/material/TextField";
 import Divider from "@mui/material/Divider";
 import { IconButton } from "@mui/material";
@@ -19,6 +19,7 @@ import DescriptionIcon from "@mui/icons-material/Description";
 import MovieIcon from "@mui/icons-material/Movie";
 import Select from "react-select";
 import { common } from "@mui/material/colors";
+import CloseIcon from "@mui/icons-material/Close";
 
 const useStyles = makeStyles(theme => ({
   root: {
@@ -32,6 +33,19 @@ const useStyles = makeStyles(theme => ({
   purple: {
     color: deepPurple[700],
     backgroundColor: deepPurple[500]
+  },
+  tagsContainer: {
+    display: "flex",
+    flexWrap: "wrap",
+    marginTop: "1rem",
+    marginBottom: "1rem"
+  },
+  chip: {
+    margin: theme.spacing(0.5)
+  },
+  button: {
+    marginLeft: theme.spacing(1),
+    padding: "0.4rem 0.4rem"
   }
 }));
 
@@ -43,10 +57,13 @@ const NewTutorial = ({ viewModal, onSidebarClick, viewCallback, active }) => {
   const [visible, setVisible] = useState(false);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(false);
+  const [tags, setTags] = useState([]);
+  const [newTag, setNewTag] = useState("");
   const [formValue, setformValue] = useState({
     title: "",
     summary: "",
-    owner: ""
+    owner: "",
+    tags: []
   });
 
   const loadingProp = useSelector(
@@ -72,6 +89,13 @@ const NewTutorial = ({ viewModal, onSidebarClick, viewCallback, active }) => {
     setError(errorProp);
   }, [errorProp]);
 
+  useEffect(() => {
+    setformValue(prev => ({
+      ...prev,
+      tags: tags
+    }));
+  }, [tags]);
+
   const organizations = useSelector(
     ({
       profile: {
@@ -114,6 +138,14 @@ const NewTutorial = ({ viewModal, onSidebarClick, viewCallback, active }) => {
       : null;
 
   useEffect(() => {
+    setTags([]);
+    setNewTag("");
+    setformValue({
+      title: "",
+      summary: "",
+      owner: "",
+      tags: []
+    });
     setVisible(viewModal);
   }, [viewModal]);
 
@@ -145,6 +177,24 @@ const NewTutorial = ({ viewModal, onSidebarClick, viewCallback, active }) => {
     }));
   };
 
+  const handleAddTag = () => {
+    if (newTag.trim() !== "") {
+      setTags([...tags, newTag.trim()]);
+      setNewTag("");
+    }
+  };
+
+  const handleDeleteTag = tagToDelete => {
+    setTags(tags.filter(tag => tag !== tagToDelete));
+  };
+
+  const handleKeyDown = e => {
+    if (e.key === "Enter") {
+      e.preventDefault();
+      handleAddTag();
+    }
+  };
+
   const classes = useStyles();
   return (
     <Modal
@@ -166,12 +216,12 @@ const NewTutorial = ({ viewModal, onSidebarClick, viewCallback, active }) => {
           background: "white",
           padding: "2rem",
           paddingTop: "1rem",
-          maxWidth: "80%"
+          maxWidth: "40%"
         }}
       >
         {error && (
           <Alert message={""} type="error" closable="true" className="mb-24">
-            description={"Tutorial Creation Failed"}/
+            description={"Tutorial Creation Failed"}
           </Alert>
         )}
         <Typography variant="h5">Create a Tutorial</Typography>
@@ -226,6 +276,35 @@ const NewTutorial = ({ viewModal, onSidebarClick, viewCallback, active }) => {
             style={{ marginBottom: "2rem" }}
           />
 
+          <TextField
+            label="Enter a tag"
+            variant="outlined"
+            size="small"
+            value={newTag}
+            onChange={e => setNewTag(e.target.value)}
+            onKeyDown={handleKeyDown}
+          />
+          <Button
+            variant="contained"
+            color="primary"
+            className={classes.button}
+            onClick={handleAddTag}
+          >
+            Add Tag
+          </Button>
+
+          <div className={classes.tagsContainer}>
+            {tags.map((tag, index) => (
+              <Chip
+                key={index}
+                label={tag}
+                onDelete={() => handleDeleteTag(tag)}
+                className={classes.chip}
+                deleteIcon={<CloseIcon />}
+              />
+            ))}
+          </div>
+
           <IconButton>
             <ImageIcon />
           </IconButton>
@@ -240,7 +319,17 @@ const NewTutorial = ({ viewModal, onSidebarClick, viewCallback, active }) => {
             <div style={{ float: "right" }}>
               <Button
                 key="back"
-                onClick={onSidebarClick}
+                onClick={() => {
+                  onSidebarClick();
+                  setTags([]);
+                  setNewTag("");
+                  setformValue({
+                    title: "",
+                    summary: "",
+                    owner: "",
+                    tags: []
+                  });
+                }}
                 id="cancelAddTutorial"
               >
                 Cancel
diff --git a/src/components/User/UserProfile/UserProfile.jsx b/src/components/User/UserProfile/UserProfile.jsx
index c0e31882..b2b52aea 100644
--- a/src/components/User/UserProfile/UserProfile.jsx
+++ b/src/components/User/UserProfile/UserProfile.jsx
@@ -9,6 +9,12 @@ import OrgUser from "../../../assets/images/org-user.svg";
 import { userList } from "../../HomePage/userList";
 import Card from "@mui/material/Card";
 import UserHighlights from "./UserHighlights";
+import { useDispatch, useSelector } from "react-redux";
+import { useFirebase, useFirestore } from "react-redux-firebase";
+import {
+  getTutorialFeedData,
+  getTutorialFeedIdArray
+} from "../../../store/actions/tutorialPageActions";
 
 const useStyles = makeStyles(theme => ({
   parentBody: {
@@ -50,6 +56,32 @@ const useStyles = makeStyles(theme => ({
 
 function UserProfile(props) {
   const classes = useStyles();
+  const firebase = useFirebase();
+  const firestore = useFirestore();
+  const dispatch = useDispatch();
+  getTutorialFeedData;
+
+  const profileData = useSelector(({ firebase: { profile } }) => profile);
+
+  useEffect(() => {
+    const getFeed = async () => {
+      const tutorialIdArray = await getTutorialFeedIdArray(profileData.uid)(
+        firebase,
+        firestore,
+        dispatch
+      );
+      getTutorialFeedData(tutorialIdArray)(firebase, firestore, dispatch);
+    };
+    getFeed();
+  }, []);
+
+  const tutorials = useSelector(
+    ({
+      tutorialPage: {
+        feed: { homepageFeedArray }
+      }
+    }) => homepageFeedArray
+  );
 
   const [organizations, setUpOrganizations] = useState([
     {
@@ -104,11 +136,14 @@ function UserProfile(props) {
           </Grid>
 
           <Grid>
-            {userList.persons.map(person => {
-              return person.Heading == "CardWithoutPicture" ? (
-                <CardWithoutPicture {...person} className={classes.card} />
+            {tutorials.map(tutorial => {
+              return !tutorial?.featured_image ? (
+                <CardWithoutPicture
+                  tutorial={tutorial}
+                  className={classes.card}
+                />
               ) : (
-                <CardWithPicture {...person} className={classes.card} />
+                <CardWithPicture tutorial={tutorial} className={classes.card} />
               );
             })}
           </Grid>
diff --git a/src/store/actions/index.js b/src/store/actions/index.js
index 76520c41..dd4e743e 100644
--- a/src/store/actions/index.js
+++ b/src/store/actions/index.js
@@ -52,6 +52,7 @@ export {
   getCurrentStepContentFromFirestore,
   getCurrentTutorialData,
   getOrgTutorialsBasicData,
+  getTutorialsByTopTags,
   getUserTutorialsBasicData,
   hideUnHideStep,
   publishUnpublishTutorial,
@@ -64,5 +65,9 @@ export {
   setTutorialTheme,
   updateStepTime,
   updateStepTitle,
+  updateTagFrequencies,
   uploadTutorialImages
 } from "./tutorialsActions";
+export {
+  getRecommendedTutorials,
+} from "./tutorialPageActions";
\ No newline at end of file
diff --git a/src/store/actions/tutorialPageActions.js b/src/store/actions/tutorialPageActions.js
index c716765a..0b900e73 100644
--- a/src/store/actions/tutorialPageActions.js
+++ b/src/store/actions/tutorialPageActions.js
@@ -100,7 +100,10 @@ export const getTutorialFeedData =
             owner: tutorial?.owner,
             created_by: tutorial?.created_by,
             createdAt: tutorial?.createdAt,
-            featured_image: tutorial?.featured_image
+            featured_image: tutorial?.featured_image,
+            tut_tags: tutorial?.tut_tags,
+            upVotes: tutorial?.upVotes || 0,
+            downVotes: tutorial?.downVotes || 0,
           };
           return tutorialData;
         });
@@ -218,3 +221,37 @@ export const addComment = comment => async (firebase, firestore, dispatch) => {
     dispatch({ type: actions.ADD_COMMENT_FAILED, payload: e.message });
   }
 };
+
+export const getRecommendedTutorials = currentTutorialTags => async (firebase, firestore) => {
+  try {
+    const tutorialsRef = firestore.collection("tutorials");
+
+    // Fetch tutorials with matching tags
+    const querySnapshot = await tutorialsRef
+      .where("tut_tags", "array-contains-any", currentTutorialTags)
+      .get();
+
+    // Calculate relevance score based on matching tags
+    const recommendedTutorials = querySnapshot.docs
+      .map(doc => {
+        const tutorial = doc.data();
+
+        // Skip unpublished tutorials
+        if (!tutorial.isPublished) return null;
+
+        const matchingTags = tutorial.tut_tags.filter(tag => currentTutorialTags.includes(tag));
+        return {
+          ...tutorial,
+          relevanceScore: matchingTags.length
+        };
+      })
+      .filter(tutorial => tutorial !== null);  // Remove null values from the array
+
+    recommendedTutorials.sort((a, b) => b.relevanceScore - a.relevanceScore);
+
+    return recommendedTutorials;
+  } catch (error) {
+    console.error("Error fetching recommended tutorials:", error);
+    return [];
+  }
+};
\ No newline at end of file
diff --git a/src/store/actions/tutorialsActions.js b/src/store/actions/tutorialsActions.js
index 7d273c1d..65eb4a92 100644
--- a/src/store/actions/tutorialsActions.js
+++ b/src/store/actions/tutorialsActions.js
@@ -122,7 +122,7 @@ export const createTutorial =
   tutorialData => async (firebase, firestore, dispatch, history) => {
     try {
       dispatch({ type: actions.CREATE_TUTORIAL_START });
-      const { title, summary, owner, created_by, is_org } = tutorialData;
+      const { title, summary, owner, created_by, is_org, tags } = tutorialData;
 
       const setData = async () => {
         const document = firestore.collection("tutorials").doc();
@@ -140,6 +140,7 @@ export const createTutorial =
           tutorial_id: documentID,
           featured_image: "",
           icon: "",
+          tut_tags: tags,
           url: "",
           background_color: "#ffffff",
           text_color: "#000000",
@@ -159,6 +160,8 @@ export const createTutorial =
         return documentID;
       };
 
+      await updateTagFrequencies(tags)(firebase, firestore);
+
       if (is_org) {
         const documentID = await setData("organization");
         history.push(`/tutorials/${owner}/${documentID}`);
@@ -173,6 +176,38 @@ export const createTutorial =
     }
   };
 
+export const updateTagFrequencies = (tags) => async (firebase, firestore) => {
+  const tagCollectionRef = firestore.collection('tag_frequencies')
+
+  for (const tag of tags) {
+    const tagDocRef = tagCollectionRef.doc(tag);
+    await firestore.runTransaction(async (transaction) => {
+      const tagDoc = await transaction.get(tagDocRef);
+      if (tagDoc.exists) {
+        const newCount = (tagDoc.data().count || 0) + 1;
+        transaction.update(tagDocRef, { count: newCount });
+      } else {
+        transaction.set(tagDocRef, { count: 1 });
+      }
+    });
+  }
+};
+
+export const getTutorialsByTopTags = (limit = 10) => async (firebase, firestore) => {
+  const tutorialCollectionRef = firestore.collection('tutorials');
+  const tagCollectionRef = firestore.collection('tag_frequencies');
+
+  const tagSnapshot = await tagCollectionRef.orderBy('count', 'desc').limit(limit).get();
+  const topTags = tagSnapshot.docs.map(doc => doc.id);
+  // console.log("topTags", topTags);
+
+  // Query tutorials that contain any of the top tags
+  const tutorialSnapshot = await tutorialCollectionRef.where('tut_tags', 'array-contains-any', topTags).get();
+  const tutorials = tutorialSnapshot.docs.map(doc => doc.data());
+
+  return tutorials;
+};
+
 const checkUserOrOrgHandle = handle => async firestore => {
   const userHandleExists = await checkUserHandleExists(handle)(firestore);
   const orgHandleExists = await checkOrgHandleExists(handle)(firestore);