diff --git a/src/Components/InviteEmail/InviteEmail.js b/src/Components/InviteEmail/InviteEmail.js
index be818b28..2e66164a 100644
--- a/src/Components/InviteEmail/InviteEmail.js
+++ b/src/Components/InviteEmail/InviteEmail.js
@@ -1,4 +1,4 @@
-function InviteEmail({ data, member, id }) {
+function InviteEmail({ data, member }) {
   return (
     <>
       <div>
@@ -16,8 +16,8 @@ function InviteEmail({ data, member, id }) {
           <i>
             <a
               href={
-                id
-                  ? `https://iedc-collab-frontend.pages.dev/projects/${id}`
+                data.id
+                  ? `https://iedc-collab-frontend.pages.dev/projects/${data.id}`
                   : `https://iedc-collab-frontend.pages.dev/projects/`
               }
               target="_blank"
diff --git a/src/Components/ProjectModal/ProjectModal.js b/src/Components/ProjectModal/ProjectModal.js
index 94d68d65..58a54364 100644
--- a/src/Components/ProjectModal/ProjectModal.js
+++ b/src/Components/ProjectModal/ProjectModal.js
@@ -11,10 +11,6 @@ import "./ProjectModal.scss";
 import { ProjectContext } from "../../contexts/ProjectContext";
 import { toast } from "react-toastify";
 import Compress from "compress.js";
-import axios from "axios";
-import { emailUrl } from "../../Utils/urls";
-import { renderEmail } from "react-html-email";
-import InviteEmail from "../InviteEmail/InviteEmail";
 import { FormControlLabel, Radio, RadioGroup } from "@mui/material";
 
 const compress = new Compress();
@@ -27,7 +23,7 @@ const NewProjectForm = ({ onClose, project, setVariable, variable }) => {
   const [projectPhoto, setProjectPhoto] = useState(
     project?.projectPhoto || null
   );
-  const { fetchData, developers } = useContext(ProjectContext);
+  const { fetchData, developers, projects } = useContext(ProjectContext);
   const initialValue = {
     name: project?.name || "",
     desc: project?.desc || "",
@@ -81,56 +77,16 @@ const NewProjectForm = ({ onClose, project, setVariable, variable }) => {
       projectPhotoName,
     };
     if (!project) {
-      doCreateProject(formValues, () => {
-        formValues.teamMembers.forEach((member) => {
-          let sent = false;
-          developers.forEach((dev) => {
-            if (dev.email === member) {
-              sent = true;
-            }
-          });
-
-          if (sent === false) {
-            axios.post(emailUrl, {
-              toEmail: member,
-              subject: "New Project",
-              content: renderEmail(
-                <InviteEmail data={formValues} member={member} />
-              ),
-            });
-          } else {
-          }
-        });
+      doCreateProject(formValues, developers, () => {
         fetchData();
+        console.log(projects);
+
         toast("Project created successfully", {
           autoClose: 3000,
         });
       });
     } else {
-      doEditProject(formValues, project.id, () => {
-        formValues.teamMembers.forEach((member) => {
-          let sent = false;
-          developers.forEach((dev) => {
-            if (dev.email === member) {
-              sent = true;
-            }
-          });
-
-          if (sent === false) {
-            axios.post(emailUrl, {
-              toEmail: member,
-              subject: "Invitation to join IEDC Collab",
-              content: renderEmail(
-                <InviteEmail
-                  data={formValues}
-                  member={member}
-                  id={project.id}
-                />
-              ),
-            });
-          } else {
-          }
-        });
+      doEditProject(formValues, project.id, developers, () => {
         fetchData();
         setVariable(!variable);
         toast("Project edited successfully", {
diff --git a/src/Firebase/firebase.js b/src/Firebase/firebase.js
index e2607090..88c19deb 100644
--- a/src/Firebase/firebase.js
+++ b/src/Firebase/firebase.js
@@ -1,6 +1,10 @@
+import axios from "axios";
 import firebase from "firebase/app";
 import "firebase/auth";
 import "firebase/database";
+import { renderEmail } from "react-html-email";
+import InviteEmail from "../Components/InviteEmail/InviteEmail";
+import { emailUrl } from "../Utils/urls";
 
 const config = {
   apiKey: process.env.REACT_APP_FB_API_KEY,
@@ -75,8 +79,9 @@ export const signOut = () => {
     });
 };
 
-export const doCreateProject = (obj, onSuccess = () => {}) => {
+export const doCreateProject = (obj, developers, onSuccess = () => {}) => {
   const user = firebase.auth().currentUser;
+
   if (!user) {
     alert("Please login to add a project");
     return;
@@ -93,6 +98,7 @@ export const doCreateProject = (obj, onSuccess = () => {}) => {
           var projectData = {
             ...obj,
             projectPhoto: photoUrl,
+            id: newProjectID,
             projectPhotoName: obj.projectPhotoName || "",
             available: true,
             createdAt,
@@ -110,6 +116,22 @@ export const doCreateProject = (obj, onSuccess = () => {}) => {
             .then(function () {
               console.log("Project added sucessfully");
               onSuccess("ADD");
+              projectData.teamMembers.forEach((member) => {
+                let sent = false;
+                developers.forEach((dev) => {
+                  if (dev.email === member) {
+                    sent = true;
+                  }
+                });
+                if (sent === false)
+                  axios.post(emailUrl, {
+                    toEmail: member,
+                    subject: "Invitation to join IEDC Collab",
+                    content: renderEmail(
+                      <InviteEmail data={projectData} member={member} />
+                    ),
+                  });
+              });
             })
             .catch(function (error) {
               alert("Something went wrong");
@@ -124,6 +146,7 @@ export const doCreateProject = (obj, onSuccess = () => {}) => {
       projectPhoto: defaultPhotoUrl,
       projectPhotoName: "Default Image",
       available: true,
+      id: newProjectID,
       createdAt,
       updatedAt: createdAt,
       leader_id: user.uid,
@@ -140,6 +163,22 @@ export const doCreateProject = (obj, onSuccess = () => {}) => {
       .then(function () {
         console.log("Project added sucessfully");
         onSuccess("ADD");
+        projectData.teamMembers.forEach((member) => {
+          let sent = false;
+          developers.forEach((dev) => {
+            if (dev.email === member) {
+              sent = true;
+            }
+          });
+          if (sent === false)
+            axios.post(emailUrl, {
+              toEmail: member,
+              subject: "Invitation to join IEDC Collab",
+              content: renderEmail(
+                <InviteEmail data={projectData} member={member} />
+              ),
+            });
+        });
       })
       .catch(function (error) {
         alert("Something went wrong");
@@ -178,7 +217,12 @@ export const doDeleteProject = (project_id, onSuccess = () => {}) => {
     });
 };
 
-export const doEditProject = async (obj, project_id, onSuccess = () => {}) => {
+export const doEditProject = async (
+  obj,
+  project_id,
+  developers,
+  onSuccess = () => {}
+) => {
   const user = firebase.auth().currentUser;
   if (!user) {
     alert("Please login to add a project");
@@ -210,18 +254,36 @@ export const doEditProject = async (obj, project_id, onSuccess = () => {}) => {
     photoUrl = obj.projectPhoto;
   }
   try {
-    await projectRef.set({
+    var projectData = {
       ...obj,
       projectPhoto: photoUrl,
+      id: project_id,
       available: true,
       updatedAt: new Date(),
       leader_id: user.uid,
       leader_name: user.displayName,
       leaderEmail: user.email,
       leaderImg: user.providerData[0]?.photoURL || null,
-    });
+    };
+    await projectRef.set(projectData);
     console.log("Project edited sucessfully");
     onSuccess("EDIT");
+    projectData.teamMembers.forEach((member) => {
+      let sent = false;
+      developers.forEach((dev) => {
+        if (dev.email === member) {
+          sent = true;
+        }
+      });
+      if (sent === false)
+        axios.post(emailUrl, {
+          toEmail: member,
+          subject: "Invitation to join IEDC Collab",
+          content: renderEmail(
+            <InviteEmail data={projectData} member={member} />
+          ),
+        });
+    });
   } catch (error) {
     alert(
       "Something went wrong during edit. Please try againg after some time"
@@ -479,19 +541,19 @@ export const getSkills = () => {
   return firebase.database().ref("skills/").once("value");
 };
 
-export const addSkills = async (skill)=>{
+export const addSkills = async (skill) => {
   // var skillId = firebase.database().ref().child("skills").push().key;
-   let skills = await getSkills();
-    let skillsArray = skills.val();
-    if(!skillsArray){
-      skillsArray = []
-    }
-    skillsArray.push(skill);
-   
+  let skills = await getSkills();
+  let skillsArray = skills.val();
+  if (!skillsArray) {
+    skillsArray = [];
+  }
+  skillsArray.push(skill);
+
   return firebase
-  .database()
-  .ref("skills/")
-  .set({
-    ...skillsArray,
-  })
-}
\ No newline at end of file
+    .database()
+    .ref("skills/")
+    .set({
+      ...skillsArray,
+    });
+};