diff --git a/client/src/containers/projects/form/cost-inputs-overrides/capex/index.tsx b/client/src/containers/projects/form/cost-inputs-overrides/capex/index.tsx
index f2b2b778..3b46777c 100644
--- a/client/src/containers/projects/form/cost-inputs-overrides/capex/index.tsx
+++ b/client/src/containers/projects/form/cost-inputs-overrides/capex/index.tsx
@@ -1,5 +1,6 @@
 import { useFormContext } from "react-hook-form";
 
+import { ACTIVITY } from "@shared/entities/activity.enum";
 import { COSTS_DTO_TO_NAME_MAP } from "@shared/schemas/assumptions/assumptions.enums";
 import {
   flexRender,
@@ -38,7 +39,10 @@ export default function CapexCostInputsTable() {
     ecosystem,
     countryCode,
     activity,
-    parameters: { restorationActivity },
+    parameters: {
+      // @ts-expect-error fix later
+      restorationActivity,
+    },
   } = form.getValues();
 
   const { queryKey } = queryKeys.customProjects.defaultCosts({
diff --git a/client/src/containers/projects/form/cost-inputs-overrides/opex/index.tsx b/client/src/containers/projects/form/cost-inputs-overrides/opex/index.tsx
index 746ccd0c..5426596e 100644
--- a/client/src/containers/projects/form/cost-inputs-overrides/opex/index.tsx
+++ b/client/src/containers/projects/form/cost-inputs-overrides/opex/index.tsx
@@ -1,5 +1,6 @@
 import { useFormContext } from "react-hook-form";
 
+import { ACTIVITY } from "@shared/entities/activity.enum";
 import { COSTS_DTO_TO_NAME_MAP } from "@shared/schemas/assumptions/assumptions.enums";
 import {
   flexRender,
@@ -38,7 +39,10 @@ export default function OpexCostInputsTable() {
     ecosystem,
     countryCode,
     activity,
-    parameters: { restorationActivity },
+    parameters: {
+      // @ts-expect-error fix later
+      restorationActivity,
+    },
   } = form.getValues();
 
   const { queryKey } = queryKeys.customProjects.defaultCosts({
diff --git a/client/src/containers/projects/form/cost-inputs-overrides/other/index.tsx b/client/src/containers/projects/form/cost-inputs-overrides/other/index.tsx
index be174738..a195af2e 100644
--- a/client/src/containers/projects/form/cost-inputs-overrides/other/index.tsx
+++ b/client/src/containers/projects/form/cost-inputs-overrides/other/index.tsx
@@ -1,5 +1,6 @@
 import { useFormContext } from "react-hook-form";
 
+import { ACTIVITY } from "@shared/entities/activity.enum";
 import { COSTS_DTO_TO_NAME_MAP } from "@shared/schemas/assumptions/assumptions.enums";
 import {
   flexRender,
@@ -38,7 +39,10 @@ export default function OtherCostInputsTable() {
     ecosystem,
     countryCode,
     activity,
-    parameters: { restorationActivity },
+    parameters: {
+      // @ts-expect-error fix later
+      restorationActivity,
+    },
   } = form.getValues();
 
   const { queryKey } = queryKeys.customProjects.defaultCosts({
diff --git a/client/src/containers/projects/form/restoration-plan/columns.tsx b/client/src/containers/projects/form/restoration-plan/columns.tsx
index 357a34db..12efea57 100644
--- a/client/src/containers/projects/form/restoration-plan/columns.tsx
+++ b/client/src/containers/projects/form/restoration-plan/columns.tsx
@@ -1,8 +1,6 @@
 import { createColumnHelper } from "@tanstack/react-table";
 
 import CellValue from "@/containers/projects/form/cell-value";
-import { DataColumnDef } from "@/containers/projects/form/cost-inputs-overrides/constants";
-import { CreateCustomProjectForm } from "@/containers/projects/form/setup";
 
 import { Label } from "@/components/ui/label";
 
@@ -27,14 +25,11 @@ export const COLUMNS = [
     cell: (props) => (
       <CellValue
         className="relative after:absolute after:right-6 after:top-1/2 after:inline-block after:-translate-y-1/2 after:text-sm after:text-muted-foreground after:content-['ha']"
-        name={`parameters.restorationYearlyBreakdown.${props.row.original.year}`}
+        // @ts-expect-error fix later
+        name={`parameters.restorationYearlyBreakdown.${props.row.original.year === -1 ? 0 : props.row.original.year}`}
         hasUnit
       />
     ),
-    // size: 75,
     maxSize: 55,
-    // cell: (props) => {
-    //   return <Label>{props.getValue()}</Label>;
-    // },
   }),
 ];
diff --git a/client/src/containers/projects/form/restoration-plan/index.tsx b/client/src/containers/projects/form/restoration-plan/index.tsx
index d132aee6..1f49f95e 100644
--- a/client/src/containers/projects/form/restoration-plan/index.tsx
+++ b/client/src/containers/projects/form/restoration-plan/index.tsx
@@ -1,8 +1,7 @@
-import { useMemo } from "react";
+import { useEffect, useMemo } from "react";
 
-import { useFormContext } from "react-hook-form";
+import { useFormContext, useWatch } from "react-hook-form";
 
-import { ASSUMPTIONS_NAME_TO_DTO_MAP } from "@shared/schemas/assumptions/assumptions.enums";
 import {
   flexRender,
   getCoreRowModel,
@@ -12,7 +11,6 @@ import {
 import { client } from "@/lib/query-client";
 import { queryKeys } from "@/lib/query-keys";
 
-import { AssumptionsFormProperty } from "@/containers/projects/form/assumptions/columns";
 import { COLUMNS } from "@/containers/projects/form/restoration-plan/columns";
 import { CreateCustomProjectForm } from "@/containers/projects/form/setup";
 
@@ -31,17 +29,33 @@ import {
   TableRow,
 } from "@/components/ui/table";
 
+const useFormValues = () => {
+  const { getValues } = useFormContext<CreateCustomProjectForm>();
+
+  return {
+    ...getValues(),
+    ...useWatch(),
+  };
+};
+
 export default function RestorationPlanProjectForm() {
   const form = useFormContext<CreateCustomProjectForm>();
 
-  const v = form.getValues();
-  console.log(v);
+  const formValues = useFormValues();
 
   const {
     ecosystem,
     activity,
-    assumptions: { projectLength },
-  } = form.getValues();
+    projectSizeHa,
+    assumptions: {
+      // @ts-expect-error fix later
+      projectLength,
+    },
+    parameters: {
+      // @ts-expect-error fix later
+      restorationYearlyBreakdown,
+    },
+  } = formValues;
 
   const { queryKey } = queryKeys.customProjects.assumptions({
     ecosystem,
@@ -68,8 +82,6 @@ export default function RestorationPlanProjectForm() {
     ? Number(projectLength)
     : defaultRestorationProjectLength;
 
-  console.log({ totalYears });
-
   const DATA = useMemo(
     () =>
       Array.from({
@@ -89,6 +101,34 @@ export default function RestorationPlanProjectForm() {
     getCoreRowModel: getCoreRowModel(),
   });
 
+  const { setError, clearErrors } = form;
+
+  const breakDownError =
+    // @ts-expect-error fix later
+    form.formState.errors.parameters?.restorationYearlyBreakdown;
+
+  useEffect(() => {
+    const totalHectares = (restorationYearlyBreakdown as string[])
+      ?.filter(Boolean)
+      .reduce((acc, hectares) => acc + Number(hectares), 0);
+
+    if (totalHectares > projectSizeHa) {
+      setError("parameters.restorationYearlyBreakdown", {
+        message: `Total hectares restored cannot exceed project size. (${totalHectares}/${projectSizeHa})`,
+      });
+    } else {
+      if (breakDownError?.message) {
+        clearErrors("parameters.restorationYearlyBreakdown");
+      }
+    }
+  }, [
+    projectSizeHa,
+    restorationYearlyBreakdown,
+    setError,
+    clearErrors,
+    breakDownError?.message,
+  ]);
+
   return (
     <Accordion type="single" collapsible defaultValue="assumptions">
       <AccordionItem value="assumptions" className="border-b-0">
@@ -103,6 +143,9 @@ export default function RestorationPlanProjectForm() {
             <p className="font-normal text-muted-foreground">
               Overrides annual hectares inputs
             </p>
+            {breakDownError && (
+              <p className="text-destructive">{breakDownError.message}</p>
+            )}
           </div>
         </AccordionTrigger>
         <AccordionContent className="pb-0">
diff --git a/client/src/containers/projects/form/setup/conservation-project-details/loss-rate.tsx b/client/src/containers/projects/form/setup/conservation-project-details/loss-rate.tsx
index 1a640c25..2b32c16a 100644
--- a/client/src/containers/projects/form/setup/conservation-project-details/loss-rate.tsx
+++ b/client/src/containers/projects/form/setup/conservation-project-details/loss-rate.tsx
@@ -26,7 +26,10 @@ export default function LossRate() {
     ecosystem,
     countryCode,
     activity,
-    parameters: { lossRateUsed },
+    parameters: {
+      // @ts-expect-error fix later
+      lossRateUsed,
+    },
   } = form.getValues();
 
   const queryKey = queryKeys.customProjects.defaultActivityTypes({
@@ -34,21 +37,24 @@ export default function LossRate() {
     countryCode,
   }).queryKey;
 
-  const { data } = client.customProjects.getActivityTypesDefaults.useQuery(
-    queryKey,
-    { query: { ecosystem, countryCode } },
-    {
+  const { data, isSuccess } =
+    client.customProjects.getActivityTypesDefaults.useQuery(
       queryKey,
-      enabled:
-        !!ecosystem &&
-        !!countryCode &&
-        lossRateUsed === LOSS_RATE_USED.NATIONAL_AVERAGE,
-      select: (response) => {
-        const { data } = response.body;
-        return data[activity as ACTIVITY.CONSERVATION].ecosystemLossRate;
+      { query: { ecosystem, countryCode } },
+      {
+        queryKey,
+        enabled:
+          !!ecosystem &&
+          !!countryCode &&
+          lossRateUsed === LOSS_RATE_USED.NATIONAL_AVERAGE,
+        select: (response) => {
+          const { data } = response.body;
+          return data[activity as ACTIVITY.CONSERVATION].ecosystemLossRate;
+        },
       },
-    },
-  );
+    );
+
+  if (!isSuccess) return null;
 
   if (lossRateUsed === LOSS_RATE_USED.NATIONAL_AVERAGE) {
     return (
diff --git a/client/src/containers/projects/form/setup/conservation-project-details/t1-global-emission-factor.tsx b/client/src/containers/projects/form/setup/conservation-project-details/t1-global-emission-factor.tsx
index 49962da6..a7a5e87b 100644
--- a/client/src/containers/projects/form/setup/conservation-project-details/t1-global-emission-factor.tsx
+++ b/client/src/containers/projects/form/setup/conservation-project-details/t1-global-emission-factor.tsx
@@ -23,18 +23,21 @@ export default function T1GlobalEmissionFactor() {
     countryCode,
   }).queryKey;
 
-  const { data } = client.customProjects.getActivityTypesDefaults.useQuery(
-    queryKey,
-    { query: { ecosystem, countryCode } },
-    {
+  const { data, isSuccess } =
+    client.customProjects.getActivityTypesDefaults.useQuery(
       queryKey,
-      enabled: !!ecosystem && !!countryCode,
-      select: (response) => {
-        const { data } = response.body;
-        return data[activity as ACTIVITY.CONSERVATION].emissionFactor.tier1;
+      { query: { ecosystem, countryCode } },
+      {
+        queryKey,
+        enabled: !!ecosystem && !!countryCode,
+        select: (response) => {
+          const { data } = response.body;
+          return data[activity as ACTIVITY.CONSERVATION].emissionFactor.tier1;
+        },
       },
-    },
-  );
+    );
+
+  if (!isSuccess) return null;
 
   return (
     <div className="flex">
diff --git a/client/src/containers/projects/form/setup/conservation-project-details/t2-national-emission-factors.tsx b/client/src/containers/projects/form/setup/conservation-project-details/t2-national-emission-factors.tsx
index 17680e47..2143b597 100644
--- a/client/src/containers/projects/form/setup/conservation-project-details/t2-national-emission-factors.tsx
+++ b/client/src/containers/projects/form/setup/conservation-project-details/t2-national-emission-factors.tsx
@@ -23,18 +23,21 @@ export default function T2NationalEmissionFactors() {
     countryCode,
   }).queryKey;
 
-  const { data } = client.customProjects.getActivityTypesDefaults.useQuery(
-    queryKey,
-    { query: { ecosystem, countryCode } },
-    {
+  const { data, isSuccess } =
+    client.customProjects.getActivityTypesDefaults.useQuery(
       queryKey,
-      enabled: !!ecosystem && !!countryCode,
-      select: (response) => {
-        const { data } = response.body;
-        return data[activity as ACTIVITY.CONSERVATION].emissionFactor.tier2;
+      { query: { ecosystem, countryCode } },
+      {
+        queryKey,
+        enabled: !!ecosystem && !!countryCode,
+        select: (response) => {
+          const { data } = response.body;
+          return data[activity as ACTIVITY.CONSERVATION].emissionFactor.tier2;
+        },
       },
-    },
-  );
+    );
+
+  if (!isSuccess) return null;
 
   return (
     <div className="flex gap-3">
diff --git a/client/src/containers/projects/form/setup/restoration-project-detail/index.tsx b/client/src/containers/projects/form/setup/restoration-project-detail/index.tsx
index be4f1f06..0183c849 100644
--- a/client/src/containers/projects/form/setup/restoration-project-detail/index.tsx
+++ b/client/src/containers/projects/form/setup/restoration-project-detail/index.tsx
@@ -47,18 +47,19 @@ export default function RestorationProjectDetails() {
     countryCode,
   }).queryKey;
 
-  const { data } = client.customProjects.getActivityTypesDefaults.useQuery(
-    queryKey,
-    { query: { ecosystem, countryCode } },
-    {
+  const { data, isSuccess } =
+    client.customProjects.getActivityTypesDefaults.useQuery(
       queryKey,
-      enabled: !!ecosystem && !!countryCode,
-      select: (response) => {
-        const { data } = response.body;
-        return data[activity as ACTIVITY.RESTORATION].sequestrationRate;
+      { query: { ecosystem, countryCode } },
+      {
+        queryKey,
+        enabled: !!ecosystem && !!countryCode,
+        select: (response) => {
+          const { data } = response.body;
+          return data[activity as ACTIVITY.RESTORATION].sequestrationRate;
+        },
       },
-    },
-  );
+    );
 
   const RESTORATION_ACTIVITY_OPTIONS = Object.values(
     RESTORATION_ACTIVITY_SUBTYPE,
@@ -179,81 +180,88 @@ export default function RestorationProjectDetails() {
           <FormField
             control={form?.control}
             name="parameters.plantingSuccessRate"
-            render={({ field }) => (
-              <FormItem className="basis-1/2 space-y-2">
-                <FormLabel
-                  tooltip={{
-                    title: "Project Specific Emission Factor",
-                    content: "TBD",
-                  }}
-                >
-                  Project Specific Emission Factor
-                </FormLabel>
-                <FormControl className="relative after:absolute after:right-6 after:inline-block after:text-sm after:text-muted-foreground after:content-['%']">
-                  <div className="relative flex flex-1 items-center">
+            render={({ field }) => {
+              // eslint-disable-next-line @typescript-eslint/no-unused-vars
+              const { value, ...restField } = field;
+
+              return (
+                <FormItem className="basis-1/2 space-y-2">
+                  <FormLabel
+                    tooltip={{
+                      title: "Planting SuccessRate",
+                      content: "TBD",
+                    }}
+                  >
+                    Planting Success Rate
+                  </FormLabel>
+                  <FormControl className="relative after:absolute after:right-6 after:inline-block after:text-sm after:text-muted-foreground after:content-['%']">
+                    <div className="relative flex flex-1 items-center">
+                      <Input
+                        {...restField}
+                        className="w-full pr-12"
+                        type="number"
+                        min={0}
+                        onChange={(v) => {
+                          form.setValue(
+                            "parameters.plantingSuccessRate",
+                            Number(v.target.value),
+                          );
+                        }}
+                        readOnly
+                        defaultValue={80}
+                        disabled
+                      />
+                    </div>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              );
+            }}
+          />
+
+          <>
+            {tierSelector === SEQUESTRATION_RATE_TIER_TYPES.TIER_1 &&
+              isSuccess && (
+                <div className="basis-1/2 space-y-2">
+                  <FormLabel
+                    tooltip={{
+                      title: "IPCC default value",
+                      content: "TBD",
+                    }}
+                  >
+                    IPCC default value
+                  </FormLabel>
+                  <div className="relative flex flex-1 items-center after:absolute after:right-6 after:inline-block after:text-sm after:text-muted-foreground after:content-['??']">
                     <Input
-                      {...field}
-                      className="w-full pr-12"
-                      type="number"
-                      min={0}
-                      onChange={(v) => {
-                        form.setValue(
-                          "parameters.plantingSuccessRate",
-                          Number(v.target.value),
-                        );
-                        // await form.trigger("parameters.plantingSuccessRate");
-                      }}
-                      readOnly
+                      className="w-full pr-32 text-muted-foreground"
                       disabled
+                      readOnly
+                      value={data?.tier1}
                     />
                   </div>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-
-          <>
-            {tierSelector === SEQUESTRATION_RATE_TIER_TYPES.TIER_1 && (
-              <div className="basis-1/2 space-y-2">
-                <FormLabel
-                  tooltip={{
-                    title: "IPCC default value",
-                    content: "TBD",
-                  }}
-                >
-                  IPCC default value
-                </FormLabel>
-                <div className="relative flex flex-1 items-center after:absolute after:right-6 after:inline-block after:text-sm after:text-muted-foreground after:content-['??']">
-                  <Input
-                    className="w-full pr-32 text-muted-foreground"
-                    disabled
-                    readOnly
-                    value={data?.tier1}
-                  />
                 </div>
-              </div>
-            )}
-            {tierSelector === SEQUESTRATION_RATE_TIER_TYPES.TIER_2 && (
-              <div className="basis-1/2 space-y-2">
-                <FormLabel
-                  tooltip={{
-                    title: "Country-specific rate",
-                    content: "TBD",
-                  }}
-                >
-                  Country-specific rate
-                </FormLabel>
-                <div className="relative flex flex-1 items-center after:absolute after:right-6 after:inline-block after:text-sm after:text-muted-foreground after:content-['??']">
-                  <Input
-                    className="w-full pr-32 text-muted-foreground"
-                    disabled
-                    readOnly
-                    value={data?.tier2}
-                  />
+              )}
+            {tierSelector === SEQUESTRATION_RATE_TIER_TYPES.TIER_2 &&
+              isSuccess && (
+                <div className="basis-1/2 space-y-2">
+                  <FormLabel
+                    tooltip={{
+                      title: "Country-specific rate",
+                      content: "TBD",
+                    }}
+                  >
+                    Country-specific rate
+                  </FormLabel>
+                  <div className="relative flex flex-1 items-center after:absolute after:right-6 after:inline-block after:text-sm after:text-muted-foreground after:content-['??']">
+                    <Input
+                      className="w-full pr-32 text-muted-foreground"
+                      disabled
+                      readOnly
+                      value={data?.tier2}
+                    />
+                  </div>
                 </div>
-              </div>
-            )}
+              )}
             {tierSelector === SEQUESTRATION_RATE_TIER_TYPES.TIER_3 && (
               <FormField
                 control={form?.control}
diff --git a/client/src/containers/projects/new/header.tsx b/client/src/containers/projects/new/header.tsx
index 4ee2e6d3..b3ae9520 100644
--- a/client/src/containers/projects/new/header.tsx
+++ b/client/src/containers/projects/new/header.tsx
@@ -21,7 +21,7 @@ export default function Header() {
       <div className="flex items-center gap-2">
         <Button variant="secondary">Cancel</Button>
         <Button
-          // disabled={!methods.formState.isValid}
+          disabled={!methods.formState.isValid}
           onClick={methods.handleSubmit(onSubmit)}
         >
           Continue
diff --git a/client/src/containers/projects/new/index.tsx b/client/src/containers/projects/new/index.tsx
index d5d9c0d5..092ab404 100644
--- a/client/src/containers/projects/new/index.tsx
+++ b/client/src/containers/projects/new/index.tsx
@@ -48,6 +48,8 @@ export const onSubmit = (data: CreateCustomProjectForm) => {
       ecosystem: data.ecosystem,
       activity: data.activity,
       countryCode: data.countryCode,
+      // @ts-expect-error fix later
+      restorationActivity: data.parameters?.restorationActivity,
     }).queryKey,
   );
 
@@ -65,8 +67,44 @@ export const onSubmit = (data: CreateCustomProjectForm) => {
     {},
   );
 
+  const validYears = // @ts-expect-error fix later
+    (originalValues.parameters.restorationYearlyBreakdown as number[])
+      .map((v, index) => {
+        // if (!v) return undefined;
+
+        return {
+          year: index == 0 ? -1 : index,
+          hectares: v,
+        };
+      })
+      .filter((v) => v.hectares > 0);
+
+  const {
+    // @ts-expect-error fix later
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    restorationYearlyBreakdown,
+    ...restParameters
+  } = originalValues.parameters;
+
   data = {
     ...originalValues,
+    parameters: {
+      ...restParameters,
+      // @ts-expect-error fix later
+      ...(restParameters?.plantingSuccessRate && {
+        plantingSuccessRate:
+          // @ts-expect-error fix later
+          restParameters.plantingSuccessRate / 100,
+      }),
+      ...(originalValues.activity === ACTIVITY.RESTORATION && {
+        ...(validYears.length > 0 && {
+          restorationYearlyBreakdown: validYears.map(({ year, hectares }) => ({
+            year,
+            annualHectaresRestored: hectares,
+          })),
+        }),
+      }),
+    },
     assumptions: {
       ...Object.keys(originalValues.assumptions ?? {}).reduce(
         (acc, assumptionKey) => {
@@ -119,7 +157,7 @@ export default function CreateCustomProject() {
   const methods = useForm<CreateCustomProjectForm>({
     resolver: zodResolver(CreateCustomProjectSchema),
     defaultValues: {
-      projectName: "test",
+      projectName: "",
       activity: ACTIVITY.CONSERVATION,
       ecosystem: ECOSYSTEM.SEAGRASS,
       countryCode: countryOptions?.[0]?.value,
@@ -134,6 +172,8 @@ export default function CreateCustomProject() {
         projectSpecificEmissionFactor: 0,
         emissionFactorSOC: 0,
         emissionFactorAGB: 0,
+        // @ts-expect-error fix later
+        plantingSuccessRate: 80,
       },
       assumptions: {
         baselineReassessmentFrequency: undefined,
diff --git a/shared/schemas/custom-projects/create-custom-project.schema.ts b/shared/schemas/custom-projects/create-custom-project.schema.ts
index 6ea2857e..548351ec 100644
--- a/shared/schemas/custom-projects/create-custom-project.schema.ts
+++ b/shared/schemas/custom-projects/create-custom-project.schema.ts
@@ -57,8 +57,8 @@ export const RestorationCustomProjectSchema = z
     restorationActivity: z.nativeEnum(RESTORATION_ACTIVITY_SUBTYPE),
     tierSelector: z.nativeEnum(SEQUESTRATION_RATE_TIER_TYPES),
     projectSpecificSequestrationRate: z
-      .number({ message: "Project Specific Rate should be a number" }),
-    lossRateUsed: z.nativeEnum(LOSS_RATE_USED),
+      .number({ message: "Project Specific Rate should be a number" }).optional(),
+    // lossRateUsed: z.nativeEnum(LOSS_RATE_USED),
     plantingSuccessRate: z.preprocess(parseNumber, z.number().nonnegative({
       message: 'Planting Success Rate should be a non-negative number',
     })),