diff --git a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
index 70c4703ff..956cb4761 100644
--- a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
+++ b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
@@ -7,7 +7,10 @@ import { connect } from "react-redux";
 import { useHistory, useLocation, useParams } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../../../firebase/firebase.utils";
-import { MARK_LATEST_APPOINTMENT_AS_ARRIVED } from "../../../../graphql/appointments.queries";
+import {
+  MARK_APPOINTMENT_ARRIVED,
+  MARK_LATEST_APPOINTMENT_ARRIVED,
+} from "../../../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../../../graphql/jobs.queries";
 import {
   selectBodyshop,
@@ -41,7 +44,8 @@ export function JobChecklistForm({
   const { t } = useTranslation();
   const [intakeJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
-  const [markAptArrived] = useMutation(MARK_LATEST_APPOINTMENT_AS_ARRIVED);
+  const [markAptArrived] = useMutation(MARK_APPOINTMENT_ARRIVED);
+  const [markLatestAptArrived] = useMutation(MARK_LATEST_APPOINTMENT_ARRIVED);
   const [updateOwner] = useMutation(UPDATE_OWNER);
 
   const { jobId } = useParams();
@@ -125,6 +129,18 @@ export function JobChecklistForm({
         variables: { appointmentId: search.appointmentId },
       });
 
+      if (!!appUpdate.errors) {
+        notification["error"]({
+          message: t("checklist.errors.complete", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+      }
+    } else if (type === "intake" && !search.appointmentId) {
+      const appUpdate = await markLatestAptArrived({
+        variables: { jobId: jobId },
+      });
+
       if (!!appUpdate.errors) {
         notification["error"]({
           message: t("checklist.errors.complete", {
@@ -133,6 +149,7 @@ export function JobChecklistForm({
         });
       }
     }
+
     if (type === "intake" && job.owner && job.owner.id) {
       //Updae Owner Allow to Text
       const updateOwnerResult = await updateOwner({
@@ -175,12 +192,7 @@ export function JobChecklistForm({
       });
     }
   };
-  console.log(job, {
-    removeFromProduction: true,
-    actual_completion:
-      job && job.actual_completion && moment(job.actual_completion),
-    actual_delivery: job && job.actual_delivery && moment(job.actual_delivery),
-  });
+
   return (
     <Card
       title={t("checklist.labels.checklist")}
diff --git a/client/src/graphql/appointments.queries.js b/client/src/graphql/appointments.queries.js
index e508e274e..d5942caca 100644
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -1,77 +1,81 @@
 import { gql } from "@apollo/client";
 
 export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
-query QUERY_ALL_ACTIVE_APPOINTMENTS(
-  $start: timestamptz!
-  $end: timestamptz!
-  $startd: date!
-  $endd: date!
-) {
-  employee_vacation(
-    where: { _or: [{ start: { _gte: $startd } },
-      { end: { _lte: $endd } },
-      {_and:[{start:{_lte: $startd}},{end:{_gte:$endd}}]}] }
+  query QUERY_ALL_ACTIVE_APPOINTMENTS(
+    $start: timestamptz!
+    $end: timestamptz!
+    $startd: date!
+    $endd: date!
   ) {
-    id
-    start
-    end
-    employee {
+    employee_vacation(
+      where: {
+        _or: [
+          { start: { _gte: $startd } }
+          { end: { _lte: $endd } }
+          { _and: [{ start: { _lte: $startd } }, { end: { _gte: $endd } }] }
+        ]
+      }
+    ) {
       id
-      last_name
-      first_name
+      start
+      end
+      employee {
+        id
+        last_name
+        first_name
+      }
     }
-  }
-  appointments(
-    where: {
-      canceled: { _eq: false }
-      end: { _lte: $end }
-      start: { _gte: $start }
-    }
-  ) {
-    start
-    id
-    end
-    arrived
-    title
-    isintake
-    block
-    color
-    note
-    job {
-      alt_transport
-      ro_number
-      ownr_ln
-      ownr_co_nm
-      ownr_fn
-      ownr_ph1
-      ownr_ph2
-      ownr_ea
-      clm_total
+    appointments(
+      where: {
+        canceled: { _eq: false }
+        end: { _lte: $end }
+        start: { _gte: $start }
+      }
+    ) {
+      start
       id
-      clm_no
-      ins_co_nm
-      v_model_yr
-      v_make_desc
-      v_model_desc
-      labhrs: joblines_aggregate(
-        where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
-      ) {
-        aggregate {
-          sum {
-            mod_lb_hrs
+      end
+      arrived
+      title
+      isintake
+      block
+      color
+      note
+      job {
+        alt_transport
+        ro_number
+        ownr_ln
+        ownr_co_nm
+        ownr_fn
+        ownr_ph1
+        ownr_ph2
+        ownr_ea
+        clm_total
+        id
+        clm_no
+        ins_co_nm
+        v_model_yr
+        v_make_desc
+        v_model_desc
+        labhrs: joblines_aggregate(
+          where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
+        ) {
+          aggregate {
+            sum {
+              mod_lb_hrs
+            }
+          }
+        }
+        larhrs: joblines_aggregate(
+          where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }
+        ) {
+          aggregate {
+            sum {
+              mod_lb_hrs
+            }
           }
         }
       }
-      larhrs: joblines_aggregate(
-        where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }
-      ) {
-        aggregate {
-          sum {
-            mod_lb_hrs
-          }
-        }
-      }
-    }
     }
   }
 `;
@@ -382,8 +386,8 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
   }
 `;
 
-export const MARK_LATEST_APPOINTMENT_AS_ARRIVED = gql`
-  mutation MARK_LATEST_APPOINTMENT_AS_ARRIVED($appointmentId: uuid!) {
+export const MARK_APPOINTMENT_ARRIVED = gql`
+  mutation MARK_APPOINTMENT_ARRIVED($appointmentId: uuid!) {
     update_appointments(
       where: { id: { _eq: $appointmentId } }
       _set: { arrived: true }
@@ -396,3 +400,21 @@ export const MARK_LATEST_APPOINTMENT_AS_ARRIVED = gql`
     }
   }
 `;
+export const MARK_LATEST_APPOINTMENT_ARRIVED = gql`
+  mutation MARK_LATEST_APPOINTMENT_ARRIVED($jobId: uuid!) {
+    update_appointments(
+      where: {
+        jobid: { _eq: $jobId }
+        canceled: { _eq: false }
+        isintake: { _eq: true }
+      }
+      _set: { arrived: true }
+    ) {
+      affected_rows
+      returning {
+        id
+        arrived
+      }
+    }
+  }
+`;