diff --git a/src/pages/Assignments/AssignmentEditor.test.tsx b/src/pages/Assignments/AssignmentEditor.test.tsx
index 353b76e5..f0fd2fd2 100644
--- a/src/pages/Assignments/AssignmentEditor.test.tsx
+++ b/src/pages/Assignments/AssignmentEditor.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { render, screen, within } from "@testing-library/react";
+import { fireEvent, render, screen, within } from "@testing-library/react";
 import "@testing-library/jest-dom";
 import { vi, beforeEach, describe, expect, it } from "vitest";
 import AssignmentEditor from "./AssignmentEditor";
@@ -95,8 +95,121 @@ describe("AssignmentEditor rubrics tab", () => {
 
 });
 
+describe("AssignmentEditor review strategy calibration behavior", () => {
+  beforeEach(() => {
+    loaderData = { ...baseAssignment, calibration_for_training: false, is_calibrated: false };
+    sendRequestMock.mockClear();
+    dispatchMock.mockClear();
+  });
+
+  it("shows uncalibrated label and calibrated field in Static strategy when calibration is enabled", () => {
+    render(<AssignmentEditor mode="update" />);
+
+    fireEvent.click(screen.getByRole("tab", { name: /Review strategy/i }));
+    expect(
+      screen.getByText("Number of reviews each reviewer is required to do")
+    ).toBeInTheDocument();
+    expect(screen.queryByText("Number of calibrated reviews")).not.toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole("tab", { name: /General/i }));
+    fireEvent.click(screen.getByLabelText("Calibration for training?"));
+
+    fireEvent.click(screen.getByRole("tab", { name: /Review strategy/i }));
+    expect(
+      screen.getByText("Number of uncalibrated reviews each reviewer is required to do")
+    ).toBeInTheDocument();
+    expect(screen.getByText("Number of calibrated reviews")).toBeInTheDocument();
+  });
+
+  it("keeps calibrated field hidden in Static strategy when calibration is disabled", () => {
+    render(<AssignmentEditor mode="update" />);
+
+    fireEvent.click(screen.getByRole("tab", { name: /Review strategy/i }));
+
+    expect(
+      screen.getByText("Number of reviews each reviewer is required to do")
+    ).toBeInTheDocument();
+    expect(screen.queryByText("Number of uncalibrated reviews each reviewer is required to do")).not.toBeInTheDocument();
+    expect(screen.queryByText("Number of calibrated reviews")).not.toBeInTheDocument();
+  });
+});
+
+describe("AssignmentEditor review mapping strategy behavior", () => {
+  beforeEach(() => {
+    loaderData = {
+      ...baseAssignment,
+      calibration_for_training: false,
+      is_calibrated: false,
+      has_topics: false,
+    };
+    sendRequestMock.mockClear();
+    dispatchMock.mockClear();
+  });
+
+  it("maps legacy Auto-Selected strategy to Dynamic UI fields", () => {
+    loaderData = { ...loaderData, review_strategy: "Auto-Selected" };
+    render(<AssignmentEditor mode="update" />);
+
+    fireEvent.click(screen.getByRole("tab", { name: /Review strategy/i }));
+
+    expect(screen.getByText("Number of reviews each reviewer is required to do")).toBeInTheDocument();
+    expect(screen.getByText("Max. number of reviews each reviewer is allowed to do")).toBeInTheDocument();
+    expect(screen.queryByText("Round Robin Assignment")).not.toBeInTheDocument();
+  });
+
+  it("maps legacy Instructor-Selected strategy to Static UI fields", () => {
+    loaderData = { ...loaderData, review_strategy: "Instructor-Selected" };
+    render(<AssignmentEditor mode="update" />);
+
+    fireEvent.click(screen.getByRole("tab", { name: /Review strategy/i }));
+
+    expect(screen.getByText("Round Robin Assignment")).toBeInTheDocument();
+    expect(screen.getByText("Random Assignment")).toBeInTheDocument();
+    expect(screen.getByText("Upload Spreadsheet Assignment")).toBeInTheDocument();
+  });
+
+  it("shows upload input and hides required-review fields when static upload strategy is selected", () => {
+    render(<AssignmentEditor mode="update" />);
+
+    fireEvent.click(screen.getByRole("tab", { name: /Review strategy/i }));
+    fireEvent.click(screen.getByLabelText("Upload Spreadsheet Assignment"));
+
+    const uploadInput = document.querySelector('input[name="spreadsheetFile"]');
+    expect(uploadInput).toBeInTheDocument();
+    expect(screen.queryByText("Number of reviews each reviewer is required to do")).not.toBeInTheDocument();
+    expect(
+      screen.queryByText("Assign reviewers to review projects that have not yet been submitted")
+    ).not.toBeInTheDocument();
+  });
+
+  it("shows review topic threshold only for Dynamic strategy when assignment has topics", () => {
+    loaderData = { ...loaderData, review_strategy: "Dynamic", has_topics: true };
+    render(<AssignmentEditor mode="update" />);
+
+    fireEvent.click(screen.getByRole("tab", { name: /Review strategy/i }));
+
+    expect(screen.getByText("Review topic threshold (k):")).toBeInTheDocument();
+  });
+
+  it("shows team-based review controls in Dynamic strategy only when has teams is enabled", () => {
+    loaderData = { ...loaderData, review_strategy: "Dynamic", has_teams: false };
+    render(<AssignmentEditor mode="update" />);
+
+    fireEvent.click(screen.getByRole("tab", { name: /Review strategy/i }));
+    expect(screen.queryByText("Is reviewing role based?")).not.toBeInTheDocument();
+    expect(screen.queryByText("Are reviews to be done by teams?")).not.toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole("tab", { name: /General/i }));
+    fireEvent.click(screen.getByLabelText("Has teams?"));
+
+    fireEvent.click(screen.getByRole("tab", { name: /Review strategy/i }));
+    expect(screen.getByText("Is reviewing role based?")).toBeInTheDocument();
+    expect(screen.getByText("Are reviews to be done by teams?")).toBeInTheDocument();
+  });
+});
+
 describe("transformAssignmentRequest", () => {
-  it("builds assignment_questionnaires_attributes for selected rounds", () => {
+  it("does not include unsupported questionnaire nested attributes", () => {
     const values: IAssignmentFormValues = {
       id: 1,
       name: "Test Assignment",
@@ -125,10 +238,7 @@ describe("transformAssignmentRequest", () => {
 
     const payload = JSON.parse(transformAssignmentRequest(values));
 
-    expect(payload.assignment.assignment_questionnaires_attributes).toEqual([
-      { id: 10, questionnaire_id: 101, used_in_round: 1 },
-      { questionnaire_id: 102, used_in_round: 2 },
-    ]);
+    expect(payload.assignment.assignment_questionnaires_attributes).toBeUndefined();
     expect(payload.assignment.vary_by_round).toBe(true);
     expect(payload.assignment.rounds_of_reviews).toBe(2);
   });
@@ -161,9 +271,7 @@ describe("transformAssignmentRequest", () => {
 
     const payload = JSON.parse(transformAssignmentRequest(values));
 
-    expect(payload.assignment.assignment_questionnaires_attributes).toEqual([
-      { id: 99, questionnaire_id: 201, used_in_round: 1 },
-    ]);
+    expect(payload.assignment.assignment_questionnaires_attributes).toBeUndefined();
   });
 
   it("sets vary_by_round to false when checkbox is unchecked", () => {
diff --git a/src/pages/Assignments/AssignmentEditor.tsx b/src/pages/Assignments/AssignmentEditor.tsx
index de8f2e52..b3115a0a 100644
--- a/src/pages/Assignments/AssignmentEditor.tsx
+++ b/src/pages/Assignments/AssignmentEditor.tsx
@@ -1,7 +1,7 @@
 import * as Yup from "yup";
 
 import { Button, Modal } from "react-bootstrap";
-import { Form, Formik, FormikHelpers } from "formik";
+import { Field, Form, Formik, FormikHelpers } from "formik";
 import { IAssignmentFormValues, transformAssignmentRequest } from "./AssignmentUtil";
 import { IEditor } from "../../utils/interfaces";
 import React, { useCallback, useEffect, useState } from "react";
@@ -73,13 +73,16 @@ const initialValues: IAssignmentFormValues = {
   has_topics: false,
   review_topic_threshold: 0,
   maximum_number_of_reviews_per_submission: 0,
-  review_strategy: "",
+  review_strategy: "Static",
   review_rubric_varies_by_round: false,
   review_rubric_varies_by_topic: false,
   review_rubric_varies_by_role: false,
   has_max_review_limit: false,
   set_allowed_number_of_reviews_per_reviewer: 0,
   set_required_number_of_reviews_per_reviewer: 0,
+  static_reviewer_strategy: "",
+  static_assignment_sheet: File ? undefined : undefined,
+  can_assign_reviewers_to_unreviewed_submissions: false,
   is_review_anonymous: false,
   is_review_done_by_teams: false,
   allow_self_reviews: false,
@@ -119,7 +122,8 @@ const AssignmentEditor: React.FC<IEditor> = ({ mode }) => {
   const { data: updateTopicResponse, error: updateTopicError, sendRequest: updateTopic } = useAPI();
   const { data: dropTeamResponse, error: dropTeamError, sendRequest: dropTeamRequest } = useAPI();
 
- 
+  const [uploadedSpreadsheet, setUploadedSpreadSheet] = useState<File | null>(null);
+
 
   const auth = useSelector(
     (state: RootState) => state.authentication,
@@ -393,7 +397,7 @@ const AssignmentEditor: React.FC<IEditor> = ({ mode }) => {
       
 
 
-  // Close the modal if the assignment is updated successfully and navigate to the assignments page
+  // Show success when assignment is saved; keep user on the current page
   useEffect(() => {
     if (
       assignmentResponse &&
@@ -406,9 +410,8 @@ const AssignmentEditor: React.FC<IEditor> = ({ mode }) => {
           message: `Assignment ${assignmentData.name} ${mode}d successfully!`,
         })
       );
-      navigate(location.state?.from ? location.state.from : "/assignments");
     }
-  }, [dispatch, mode, navigate, assignmentData, assignmentResponse, location.state?.from]);
+  }, [dispatch, mode, assignmentData, assignmentResponse]);
 
   // Show the error message if the assignment is not updated successfully
   useEffect(() => {
@@ -798,40 +801,270 @@ const AssignmentEditor: React.FC<IEditor> = ({ mode }) => {
                   <FormSelect
                     controlId="assignment-review_strategy"
                     name="review_strategy"
+                    onChange={(event) => {
+                      const selectedStrategy = event.target.value;
+                      if (selectedStrategy === "Dynamic") {
+                        const requiredReviews = Number(formik.values.set_required_number_of_reviews_per_reviewer ?? 0);
+                        const allowedReviews = Number(formik.values.set_allowed_number_of_reviews_per_reviewer ?? 0);
+                        if (allowedReviews < requiredReviews) {
+                          formik.setFieldValue("set_allowed_number_of_reviews_per_reviewer", requiredReviews);
+                        }
+                        if (!formik.values.review_topic_threshold || Number(formik.values.review_topic_threshold) <= 0) {
+                          formik.setFieldValue("review_topic_threshold", 1);
+                        }
+                      }
+                    }}
                     options={[
-                      { label: "Review Strategy 1", value: 1 },
-                      { label: "Review Strategy 2", value: 2 },
-                      { label: "Review Strategy 3", value: 3 },
+                      { label: "Static", value: "Static" },
+                      { label: "Dynamic", value: "Dynamic" },
                     ]}
                   />
                 </div>
-                {formik.values.has_topics && (
-                  <div style={{ display: 'flex', alignItems: 'center', columnGap: '10px' }}>
-                    <label className="form-label">Review topic threshold (k):</label>
-                    <div style={{ width: '70px', display: 'flex', alignItems: 'center' }}>
-                      <FormInput controlId="assignment-review_topic_threshold" name="review_topic_threshold" type="number" />
+
+                {(() => {
+                  const normalizedReviewStrategy =
+                    formik.values.review_strategy === "Auto-Selected"
+                      ? "Dynamic"
+                      : formik.values.review_strategy === "Instructor-Selected"
+                        ? "Static"
+                        : formik.values.review_strategy;
+                  const isDynamic = normalizedReviewStrategy === "Dynamic";
+                  const requiredReviews = Number(formik.values.set_required_number_of_reviews_per_reviewer ?? 0);
+                  const allowedReviews = Number(formik.values.set_allowed_number_of_reviews_per_reviewer ?? 0);
+                  const reviewTopicThreshold = Number(formik.values.review_topic_threshold ?? 1);
+                  const isCalibrationInUse = !!(formik.values.calibration_for_training || formik.values.is_calibrated);
+
+                  return isDynamic ? (
+                    <>
+                      <div
+                        style={{
+                          display: 'grid',
+                          alignItems: 'center',
+                          columnGap: '10px',
+                          rowGap: '10px',
+                          gridTemplateColumns: 'max-content 100px'
+                        }}
+                      >
+                        <label className="form-label">Number of reviews each reviewer is required to do</label>
+                        <Field name="set_required_number_of_reviews_per_reviewer">
+                          {({ field }: any) => (
+                            <input
+                              {...field}
+                              className="form-control"
+                              type="number"
+                              min={0}
+                              value={requiredReviews}
+                              onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                                const value = Number(event.target.value || 0);
+                                formik.setFieldValue("set_required_number_of_reviews_per_reviewer", value);
+                                if (allowedReviews < value) {
+                                  formik.setFieldValue("set_allowed_number_of_reviews_per_reviewer", value);
+                                }
+                              }}
+                            />
+                          )}
+                        </Field>
+
+                        <label className="form-label">Max. number of reviews each reviewer is allowed to do</label>
+                        <Field name="set_allowed_number_of_reviews_per_reviewer">
+                          {({ field }: any) => (
+                            <input
+                              {...field}
+                              className="form-control"
+                              type="number"
+                              min={requiredReviews}
+                              value={Math.max(allowedReviews, requiredReviews)}
+                              onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                                const value = Number(event.target.value || 0);
+                                formik.setFieldValue(
+                                  "set_allowed_number_of_reviews_per_reviewer",
+                                  Math.max(value, requiredReviews)
+                                );
+                              }}
+                            />
+                          )}
+                        </Field>
+                      </div>
+
+                      {formik.values.has_topics && (
+                        <div style={{ display: 'flex', alignItems: 'center', columnGap: '10px' }}>
+                          <div style={{ display: 'flex', alignItems: 'center', columnGap: '5px' }}>
+                            <label className="form-label">Review topic threshold (k):</label>
+                            <ToolTip
+                              id="assignment-review-topic-threshold-k-tooltip"
+                              info="A topic is reviewable if the minimum number of reviews already done for the submissions on that topic is within k of the minimum number of reviews done on the least-reviewed submission on any topic."
+                            />
+                          </div>
+                          <div style={{ width: '100px' }}>
+                            <Field name="review_topic_threshold">
+                              {({ field }: any) => (
+                                <input
+                                  {...field}
+                                  className="form-control"
+                                  type="number"
+                                  min={1}
+                                  value={reviewTopicThreshold > 0 ? reviewTopicThreshold : 1}
+                                  onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                                    formik.setFieldValue("review_topic_threshold", Number(event.target.value || 1));
+                                  }}
+                                />
+                              )}
+                            </Field>
+                          </div>
+                        </div>
+                      )}
+                    </>
+                  ) : (
+                    <>
+
+                    <div>
+                      <label className="d-block">
+                        <input
+                          type="radio"
+                          name="static_reviewer_strategy"
+                          value="Round Robin"
+                          checked={formik.values.static_reviewer_strategy === "Round Robin"}
+                          onChange={formik.handleChange}
+                          style={{ marginRight: "8px" }}
+                        />
+                         Round-robin assignment
+                      </label>
+
+                      <label className="d-block">
+                        <input
+                          type="radio"
+                          name="static_reviewer_strategy"
+                          value="Random"
+                          checked={formik.values.static_reviewer_strategy === "Random"}
+                          onChange={formik.handleChange}
+                          style={{ marginRight: "8px" }}
+                        />
+                         Random assignment
+                      </label>
+
+                      <label className="d-block">
+                        <input
+                          type="radio"
+                          name="static_reviewer_strategy"
+                          value="Upload Spreadsheet"
+                          checked={formik.values.static_reviewer_strategy === "Upload Spreadsheet"}
+                          onChange={formik.handleChange}
+                          style={{ marginRight: "8px" }}
+                        />
+                         Upload spreadsheet
+                      </label>
                     </div>
-                  </div>
-                )}
-                <div style={{ display: 'grid', alignItems: 'center', columnGap: '10px', gridTemplateColumns: 'max-content 1fr' }}>
-                  <label className="form-label">Maximum number of reviews per submission:</label>
-                  <div style={{ width: '70px', display: 'flex', alignItems: 'center' }}>
-                    <FormInput controlId="assignment-maximum_number_of_reviews_per_submission" name="maximum_number_of_reviews_per_submission" type="number" />
-                  </div>
-                  <FormCheckbox controlId="assignment-has_max_review_limit" label="Has max review limit?" name="has_max_review_limit" />
-                  <div></div>
-                  <label className="form-label">Set allowed number of reviews per reviewer:</label>
-                  <div style={{ width: '70px', display: 'flex', alignItems: 'center' }}>
-                    <FormInput controlId="assignment-set_allowed_number_of_reviews_per_reviewer" name="set_allowed_number_of_reviews_per_reviewer" type="number" />
-                  </div>
-                  <label className="form-label">Set required number of reviews per reviewer:</label>
-                  <div style={{ width: '70px', display: 'flex', alignItems: 'center' }}>
-                    <FormInput controlId="assignment-set_required_number_of_reviews_per_reviewer" name="set_required_number_of_reviews_per_reviewer" type="number" />
-                  </div>
+                    
+                    {formik.values.static_reviewer_strategy === "Upload Spreadsheet" && (
+                      <>
+                      <input
+                        name="spreadsheetFile"
+                        type="file"
+                        onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                          if (event.currentTarget.files) {
+                            // Take the first file (you can extend this to multiple if you want)
+                            formik.values.static_assignment_sheet === event.currentTarget.files[0];
+                          }
+                        }}
+                      />
+
+
+                    </>
+                    )}
+
+                    {formik.values.static_reviewer_strategy !== "Upload Spreadsheet" && (
+                        <>
+                          <div
+                          style={{
+                            display: 'grid',
+                            alignItems: 'center',
+                            columnGap: '10px',
+                            rowGap: '10px',
+                            gridTemplateColumns: 'max-content 100px'
+                          }}
+                        >
+                          <label className="form-label">
+                            {isCalibrationInUse
+                              ? "Number of uncalibrated reviews each reviewer is required to do"
+                              : "Number of reviews each reviewer is required to do"}
+                          </label>
+                          <Field name="set_required_number_of_reviews_per_reviewer">
+                            {({ field }: any) => (
+                              <input
+                                {...field}
+                                className="form-control"
+                                type="number"
+                                min={0}
+                                value={requiredReviews}
+                                onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                                  const value = Number(event.target.value || 0);
+                                  formik.setFieldValue("set_required_number_of_reviews_per_reviewer", value);
+                                  if (allowedReviews < value) {
+                                    formik.setFieldValue("set_allowed_number_of_reviews_per_reviewer", value);
+                                  }
+                                }}
+                              />
+                            )}
+                          </Field>
+
+                          {isCalibrationInUse && (
+                            <>
+                              <label className="form-label">Number of calibrated reviews</label>
+                              <Field name="number_of_calibrated_reviews">
+                                {({ field }: any) => (
+                                  <input
+                                    {...field}
+                                    className="form-control"
+                                    type="number"
+                                    min={0}
+                                    value={Number(formik.values.number_of_calibrated_reviews ?? 0)}
+                                    onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                                      formik.setFieldValue("number_of_calibrated_reviews", Number(event.target.value || 0));
+                                    }}
+                                  />
+                                )}
+                              </Field>
+                            </>
+                          )}
+                          </div>
+
+                          <div style={{ marginTop: '15px', display: 'flex', alignItems: 'center', columnGap: '6px' }}>
+                            <FormCheckbox
+                              label="Assign reviewers to review projects that have not yet been submitted" 
+                              name="can_assign_reviewers_to_unreviewed_submissions" />
+                          </div>
+                        </>
+                      )
+                    }
+                    
+                  
+                    </>
+                
+                )})()}
+
+                <div style={{ marginTop: '15px', display: 'flex', alignItems: 'center', columnGap: '6px' }}>
+                  <FormCheckbox controlId="assignment-is_review_anonymous" label="Is reviewing anonymous?" name="is_review_anonymous" />
+                  <ToolTip id="assignment-is-review-anonymous-tooltip" info="If it is anonymous, students can't see who is reviewing them." />
                 </div>
-                <FormCheckbox controlId="assignment-is_review_anonymous" label="Is review anonymous?" name="is_review_anonymous" />
-                <FormCheckbox controlId="assignment-is_review_done_by_teams" label="Is review done by teams?" name="is_review_done_by_teams" />
-                <FormCheckbox controlId="assignment-allow_self_reviews" label="Allow self-reviews?" name="allow_self_reviews" />
+
+                <div style={{ display: 'flex', alignItems: 'center', columnGap: '6px' }}>
+                  <FormCheckbox controlId="assignment-allow_self_reviews" label="Are self-reviews required?" name="allow_self_reviews" />
+                  <ToolTip id="assignment-self-reviews-required-tooltip" info="If this is checked, reviewers will be required to review themselves (or their team) as well as to review submissions by others." />
+                </div>
+
+                {formik.values.has_teams && (
+                  <>
+                    <div style={{ display: 'flex', alignItems: 'center', columnGap: '6px' }}>
+                      <FormCheckbox controlId="assignment-review_rubric_varies_by_role" label="Is reviewing role based?" name="review_rubric_varies_by_role" />
+                      <ToolTip id="assignment-review-role-based-tooltip" info="If this is chosen, every team member will need to choose a role, and team members will review their contributions based on the rubric for that role." />
+                    </div>
+                    <div style={{ display: 'flex', alignItems: 'center', columnGap: '6px' }}>
+                      <FormCheckbox controlId="assignment-is_review_done_by_teams" label="Are reviews to be done by teams?" name="is_review_done_by_teams" />
+                      <ToolTip id="assignment-review-done-by-teams-tooltip" info="If this is chosen, teams (not individuals) will be assigned to review other teams." />
+                    </div>
+                  </>
+                )}
+
                 <FormCheckbox controlId="assignment-reviews_visible_to_other_reviewers" label="Reviews visible to other reviewers?" name="reviews_visible_to_other_reviewers" />
 
               </Tab>
diff --git a/src/pages/Assignments/AssignmentUtil.ts b/src/pages/Assignments/AssignmentUtil.ts
index d8c3caeb..1ae3b14f 100644
--- a/src/pages/Assignments/AssignmentUtil.ts
+++ b/src/pages/Assignments/AssignmentUtil.ts
@@ -7,6 +7,7 @@ export interface IAssignmentFormValues {
   name: string;
   directory_path: string;
   spec_location: string;
+  description_url?: string;
   private: boolean;
   show_template_review: boolean;
   require_quiz: boolean;
@@ -83,31 +84,69 @@ export interface IAssignmentFormValues {
 
 
 export const transformAssignmentRequest = (values: IAssignmentFormValues) => {
-  // Build nested attributes for assignment_questionnaires from the per-round form fields to create or update corresponding rows
-  const assignmentQuestionnaires: { id?: number; questionnaire_id: number; used_in_round: number }[] = [];
-  const roundCount = values.number_of_review_rounds ?? 0;
-  for (let i = 1; i <= roundCount; i += 1) {
-    const questionnaireId = values[`questionnaire_round_${i}`];
-    if (questionnaireId) {
-      const existingId = values[`assignment_questionnaire_id_${i}`];
-      assignmentQuestionnaires.push({
-        id: existingId,
-        questionnaire_id: questionnaireId,
-        used_in_round: i,
-      });
+  const backendAssignmentKeys = new Set([
+    "name",
+    "directory_path",
+    "URL",
+    "course_id",
+    "private",
+    "require_quiz",
+    "staggered_deadline",
+    "is_calibrated",
+    "has_teams",
+    "max_team_size",
+    "has_topics",
+    "review_topic_threshold",
+    "max_reviews_per_submission",
+    "review_assignment_strategy",
+    "vary_by_round",
+    "team_members_have_duty",
+    "num_reviews_allowed",
+    "num_reviews_required",
+    "is_anonymous",
+    "team_reviewing_enabled",
+    "is_selfreview_enabled",
+    "reviews_visible_to_all",
+    "rounds_of_reviews",
+    "days_between_submissions",
+    "late_policy_id",
+    "is_penalty_calculated",
+    "calculate_penalty",
+    "is_answer_tagging_allowed",
+    "available_to_students",
+    "bidding_for_reviews_enabled",
+    "can_choose_topic_to_review",
+    "can_bookmark_topics",
+    "show_teammate_reviews",
+    "enable_pair_programming",
+    "auto_assign_mentor",
+  ]);
+
+  const normalizedReviewStrategy = (() => {
+    if (values.review_strategy === "Dynamic" || values.review_strategy === "Auto-Selected") {
+      return "Dynamic";
     }
-  }
+    if (values.review_strategy === "Static" || values.review_strategy === "Instructor-Selected") {
+      return "Static";
+    }
+    return "Static";
+  })();
 
-  const assignment: IAssignmentRequest = {
+  const requiredReviews = Number(values.set_required_number_of_reviews_per_reviewer ?? 0);
+  const allowedReviews = Math.max(
+    Number(values.set_allowed_number_of_reviews_per_reviewer ?? 0),
+    requiredReviews
+  );
+
+  const assignment: any = {
     // Core fields
     name: values.name,
     directory_path: values.directory_path,
-    spec_location: values.spec_location,
+    URL: values.spec_location ?? values.description_url,
     course_id: values.course_id,
 
     // Visibility / basic flags
     private: values.private,
-    show_template_review: values.show_template_review ?? false,
     require_quiz: values.require_quiz ?? false,
     has_badge: values.has_badge ?? false,
     staggered_deadline: values.staggered_deadline ?? false,
@@ -116,70 +155,51 @@ export const transformAssignmentRequest = (values: IAssignmentFormValues) => {
     // Team / mentor / topic configuration
     has_teams: values.has_teams ?? false,
     max_team_size: values.max_team_size,
-    show_teammate_review: values.show_teammate_review ?? false,
-    is_pair_programming: values.is_pair_programming ?? false,
-    has_mentors: values.has_mentors ?? false,
     has_topics: values.has_topics ?? false,
-    auto_assign_mentors: values.auto_assign_mentors ?? false,
 
     // Review strategy / limits
     review_topic_threshold: values.review_topic_threshold,
-    maximum_number_of_reviews_per_submission: values.maximum_number_of_reviews_per_submission,
-    review_strategy: values.review_strategy,
-    review_rubric_varies_by_round: values.review_rubric_varies_by_round ?? false,
-    review_rubric_varies_by_topic: values.review_rubric_varies_by_topic ?? false,
-    review_rubric_varies_by_role: values.review_rubric_varies_by_role ?? false,
-    has_max_review_limit: values.has_max_review_limit ?? false,
-    set_allowed_number_of_reviews_per_reviewer: values.set_allowed_number_of_reviews_per_reviewer,
-    set_required_number_of_reviews_per_reviewer: values.set_required_number_of_reviews_per_reviewer,
-    is_review_anonymous: values.is_review_anonymous ?? false,
-    is_review_done_by_teams: values.is_review_done_by_teams ?? false,
-    allow_self_reviews: values.allow_self_reviews ?? false,
-    reviews_visible_to_other_reviewers: values.reviews_visible_to_other_reviewers ?? false,
-    number_of_review_rounds: values.number_of_review_rounds,
+    max_reviews_per_submission: values.maximum_number_of_reviews_per_submission,
+    review_assignment_strategy: normalizedReviewStrategy,
+    vary_by_round: values.review_rubric_varies_by_round ?? false,
+    team_members_have_duty: values.review_rubric_varies_by_role ?? false,
+    num_reviews_allowed: allowedReviews,
+    num_reviews_required: requiredReviews,
+    is_anonymous: values.is_review_anonymous ?? false,
+    team_reviewing_enabled: values.is_review_done_by_teams ?? false,
+    is_selfreview_enabled: values.allow_self_reviews ?? false,
+    reviews_visible_to_all: values.reviews_visible_to_other_reviewers ?? false,
+    rounds_of_reviews: values.number_of_review_rounds,
 
     // Dates / penalties
     days_between_submissions: values.days_between_submissions,
     late_policy_id: values.late_policy_id,
     is_penalty_calculated: values.is_penalty_calculated ?? false,
     calculate_penalty: values.calculate_penalty ?? false,
-    apply_late_policy: values.apply_late_policy ?? false,
-
-    // Deadline toggles
-    use_signup_deadline: values.use_signup_deadline ?? false,
-    use_drop_topic_deadline: values.use_drop_topic_deadline ?? false,
-    use_team_formation_deadline: values.use_team_formation_deadline ?? false,
-
     // JSON-configured deadline settings (default to empty arrays so backend always sees a consistent shape)
     weights: values.weights ?? [],
     notification_limits: values.notification_limits ?? [],
-    use_date_updater: values.use_date_updater ?? [],
-    submission_allowed: values.submission_allowed ?? [],
-    review_allowed: values.review_allowed ?? [],
-    teammate_allowed: values.teammate_allowed ?? [],
-    metareview_allowed: values.metareview_allowed ?? [],
     reminder: values.reminder ?? [],
 
     // Misc flags from other tabs
-    allow_tag_prompts: values.allow_tag_prompts ?? false,
-    has_quizzes: values.has_quizzes ?? false,
-    calibration_for_training: values.calibration_for_training ?? false,
+    is_answer_tagging_allowed: values.allow_tag_prompts ?? false,
     available_to_students: values.available_to_students ?? false,
-    allow_topic_suggestion_from_students: values.allow_topic_suggestion_from_students ?? false,
-    enable_bidding_for_topics: values.enable_bidding_for_topics ?? false,
-    enable_bidding_for_reviews: values.enable_bidding_for_reviews ?? false,
-    enable_authors_to_review_other_topics: values.enable_authors_to_review_other_topics ?? false,
-    allow_reviewer_to_choose_topic_to_review: values.allow_reviewer_to_choose_topic_to_review ?? false,
-    allow_participants_to_create_bookmarks: values.allow_participants_to_create_bookmarks ?? false,
-    staggered_deadline_assignment: values.staggered_deadline_assignment ?? false,
-
-    // Per-round rubric configuration
-    vary_by_round: values.review_rubric_varies_by_round,
-    rounds_of_reviews: values.number_of_review_rounds,
-    assignment_questionnaires_attributes: assignmentQuestionnaires,
+    bidding_for_reviews_enabled: values.enable_bidding_for_reviews ?? false,
+    can_choose_topic_to_review: values.allow_reviewer_to_choose_topic_to_review ?? false,
+    can_bookmark_topics: values.allow_participants_to_create_bookmarks ?? false,
+    show_teammate_reviews: values.show_teammate_review ?? false,
+    enable_pair_programming: values.is_pair_programming ?? false,
+    auto_assign_mentor: values.auto_assign_mentors ?? false,
 
   };
-  return JSON.stringify({ assignment });
+
+  const filteredAssignment = Object.fromEntries(
+    Object.entries(assignment).filter(
+      ([key, value]) => backendAssignmentKeys.has(key) && value !== undefined
+    )
+  );
+
+  return JSON.stringify({ assignment: filteredAssignment });
 };
 
 export const transformAssignmentResponse = (assignmentResponse: string) => {
@@ -227,7 +247,8 @@ export const transformAssignmentResponse = (assignmentResponse: string) => {
     id: assignment.id,
     name: assignment.name,
     directory_path: assignment.directory_path,
-    spec_location: assignment.spec_location,
+    spec_location: (assignment as any).URL ?? assignment.spec_location ?? (assignment as any).description_url ?? "",
+    description_url: (assignment as any).description_url ?? (assignment as any).URL,
     private: assignment.private,
     show_template_review: assignment.show_template_review ?? false,
     require_quiz: assignment.require_quiz,
@@ -237,8 +258,28 @@ export const transformAssignmentResponse = (assignmentResponse: string) => {
 
     // review rounds / rubrics
     review_rubric_varies_by_round:
-      assignment.varying_rubrics_by_round ?? assignment.vary_by_round,
-    number_of_review_rounds: assignment.num_review_rounds,
+      assignment.varying_rubrics_by_round ?? assignment.vary_by_round ?? (assignment as any).vary_by_round,
+    number_of_review_rounds: assignment.num_review_rounds ?? (assignment as any).rounds_of_reviews,
+
+    // map backend review strategy keys into AssignmentEditor form fields
+    review_strategy:
+      ((assignment as any).review_assignment_strategy ?? (assignment as any).review_strategy) === "Auto-Selected"
+        ? "Dynamic"
+        : ((assignment as any).review_assignment_strategy ?? (assignment as any).review_strategy) === "Instructor-Selected"
+          ? "Static"
+          : ((assignment as any).review_assignment_strategy ?? (assignment as any).review_strategy) ?? "Static",
+    set_required_number_of_reviews_per_reviewer: Number((assignment as any).set_required_number_of_reviews_per_reviewer ?? (assignment as any).num_reviews_required ?? 0),
+    set_allowed_number_of_reviews_per_reviewer: Number((assignment as any).set_allowed_number_of_reviews_per_reviewer ?? (assignment as any).num_reviews_allowed ?? 0),
+    is_review_anonymous: !!((assignment as any).is_review_anonymous ?? (assignment as any).is_anonymous),
+    allow_self_reviews: !!((assignment as any).allow_self_reviews ?? (assignment as any).is_selfreview_enabled),
+    review_rubric_varies_by_role: !!((assignment as any).review_rubric_varies_by_role ?? (assignment as any).team_members_have_duty),
+    is_review_done_by_teams: !!((assignment as any).is_review_done_by_teams ?? (assignment as any).team_reviewing_enabled),
+    maximum_number_of_reviews_per_submission: Number((assignment as any).max_reviews_per_submission ?? (assignment as any).maximum_number_of_reviews_per_submission ?? 0),
+    reviews_visible_to_other_reviewers: !!((assignment as any).reviews_visible_to_other_reviewers ?? (assignment as any).reviews_visible_to_all),
+    show_teammate_review: !!((assignment as any).show_teammate_review ?? (assignment as any).show_teammate_reviews),
+    is_pair_programming: !!((assignment as any).is_pair_programming ?? (assignment as any).enable_pair_programming),
+    auto_assign_mentors: !!((assignment as any).auto_assign_mentors ?? (assignment as any).auto_assign_mentor),
+    review_topic_threshold: Number((assignment as any).review_topic_threshold ?? 1),
 
     // precomputed date/time fields for the Due dates tab
     date_time: dateTimeMap as any,
diff --git a/src/utils/interfaces.ts b/src/utils/interfaces.ts
index 5454e972..f9043ba5 100644
--- a/src/utils/interfaces.ts
+++ b/src/utils/interfaces.ts
@@ -86,12 +86,13 @@ export interface IAssignmentRequest {
   // Core fields
   name: string;
   directory_path: string;
-  spec_location: string;
+  spec_location?: string;
+  description_url?: string;
   course_id?: number;
 
   // Visibility / basic flags
   private: boolean;
-  show_template_review: boolean;
+  show_template_review?: boolean;
   require_quiz: boolean;
   has_badge: boolean;
   staggered_deadline: boolean;
@@ -110,14 +111,21 @@ export interface IAssignmentRequest {
   review_topic_threshold?: number;
   maximum_number_of_reviews_per_submission?: number;
   review_strategy?: string | number;
+  review_assignment_strategy?: string;
   review_rubric_varies_by_round?: boolean;
   review_rubric_varies_by_topic?: boolean;
   review_rubric_varies_by_role?: boolean;
   has_max_review_limit?: boolean;
   set_allowed_number_of_reviews_per_reviewer?: number;
   set_required_number_of_reviews_per_reviewer?: number;
+  num_reviews_allowed?: number;
+  num_reviews_required?: number;
   is_review_anonymous?: boolean;
   is_review_done_by_teams?: boolean;
+  is_anonymous?: boolean;
+  is_selfreview_enabled?: boolean;
+  team_members_have_duty?: boolean;
+  team_reviewing_enabled?: boolean;
   allow_self_reviews?: boolean;
   reviews_visible_to_other_reviewers?: boolean;
   number_of_review_rounds?: number;
@@ -245,7 +253,8 @@ export interface IAssignmentResponse {
   created_at: Date; 
   updated_at: Date; 
   directory_path: string;
-  spec_location:string;
+  spec_location?: string;
+  description_url?: string;
   private:boolean;
   show_template_review: boolean;
   require_quiz:boolean;