diff --git a/src/components/Exercises/MultipleChoice.tsx b/src/components/Exercises/MultipleChoice.tsx
index d29eab9d..ebaaf856 100644
--- a/src/components/Exercises/MultipleChoice.tsx
+++ b/src/components/Exercises/MultipleChoice.tsx
@@ -16,9 +16,13 @@ function Question({
 }: MultipleChoiceQuestion & {userSolution: string | undefined; onSelectOption?: (option: string) => void; showSolution?: boolean}) {
 	return (
 		<div className="flex flex-col gap-10">
-			<span className="">
-				{id} - {prompt}
-			</span>
+			{isNaN(Number(id)) ? (
+				<span className="">{prompt}</span>
+			) : (
+				<span className="">
+					{id} - {prompt}
+				</span>
+			)}
 			<div className="flex flex-wrap gap-4 justify-between">
 				{variant === "image" &&
 					options.map((option) => (
diff --git a/src/components/Solutions/MultipleChoice.tsx b/src/components/Solutions/MultipleChoice.tsx
index 4d2b8e61..ecbf0025 100644
--- a/src/components/Solutions/MultipleChoice.tsx
+++ b/src/components/Solutions/MultipleChoice.tsx
@@ -27,9 +27,13 @@ function Question({
 
 	return (
 		<div className="flex flex-col items-center gap-4">
-			<span>
-				{id} - {prompt}
-			</span>
+			{isNaN(Number(id)) ? (
+				<span className="">{prompt}</span>
+			) : (
+				<span className="">
+					{id} - {prompt}
+				</span>
+			)}
 			<div className="grid grid-cols-4 gap-4 place-items-center">
 				{variant === "image" &&
 					options.map((option) => (
diff --git a/src/pages/(exam)/ExamPage.tsx b/src/pages/(exam)/ExamPage.tsx
index 99b102c4..d583284b 100644
--- a/src/pages/(exam)/ExamPage.tsx
+++ b/src/pages/(exam)/ExamPage.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable @next/next/no-img-element */
-import { Module } from "@/interfaces";
-import { useEffect, useState } from "react";
+import {Module} from "@/interfaces";
+import {useEffect, useState} from "react";
 
 import AbandonPopup from "@/components/AbandonPopup";
 import Layout from "@/components/High/Layout";
@@ -12,567 +12,447 @@ import Selection from "@/exams/Selection";
 import Speaking from "@/exams/Speaking";
 import Writing from "@/exams/Writing";
 import useUser from "@/hooks/useUser";
-import { Exam, UserSolution, Variant } from "@/interfaces/exam";
-import { Stat } from "@/interfaces/user";
+import {Exam, UserSolution, Variant} from "@/interfaces/exam";
+import {Stat} from "@/interfaces/user";
 import useExamStore from "@/stores/examStore";
-import {
-  evaluateSpeakingAnswer,
-  evaluateWritingAnswer,
-} from "@/utils/evaluation";
-import { defaultExamUserSolutions, getExam } from "@/utils/exams";
+import {evaluateSpeakingAnswer, evaluateWritingAnswer} from "@/utils/evaluation";
+import {defaultExamUserSolutions, getExam} from "@/utils/exams";
 import axios from "axios";
-import { useRouter } from "next/router";
-import { toast, ToastContainer } from "react-toastify";
-import { v4 as uuidv4 } from "uuid";
+import {useRouter} from "next/router";
+import {toast, ToastContainer} from "react-toastify";
+import {v4 as uuidv4} from "uuid";
 import useSessions from "@/hooks/useSessions";
 import ShortUniqueId from "short-unique-id";
 
 interface Props {
-  page: "exams" | "exercises";
+	page: "exams" | "exercises";
 }
 
-export default function ExamPage({ page }: Props) {
-  const [variant, setVariant] = useState<Variant>("full");
-  const [avoidRepeated, setAvoidRepeated] = useState(false);
-  const [hasBeenUploaded, setHasBeenUploaded] = useState(false);
-  const [showAbandonPopup, setShowAbandonPopup] = useState(false);
-  const [isEvaluationLoading, setIsEvaluationLoading] = useState(false);
-  const [statsAwaitingEvaluation, setStatsAwaitingEvaluation] = useState<
-    string[]
-  >([]);
-  const [timeSpent, setTimeSpent] = useState(0);
+export default function ExamPage({page}: Props) {
+	const [variant, setVariant] = useState<Variant>("full");
+	const [avoidRepeated, setAvoidRepeated] = useState(false);
+	const [hasBeenUploaded, setHasBeenUploaded] = useState(false);
+	const [showAbandonPopup, setShowAbandonPopup] = useState(false);
+	const [isEvaluationLoading, setIsEvaluationLoading] = useState(false);
+	const [statsAwaitingEvaluation, setStatsAwaitingEvaluation] = useState<string[]>([]);
+	const [timeSpent, setTimeSpent] = useState(0);
 
-  const resetStore = useExamStore((state) => state.reset);
-  const assignment = useExamStore((state) => state.assignment);
-  const initialTimeSpent = useExamStore((state) => state.timeSpent);
+	const resetStore = useExamStore((state) => state.reset);
+	const assignment = useExamStore((state) => state.assignment);
+	const initialTimeSpent = useExamStore((state) => state.timeSpent);
 
-  const examStore = useExamStore;
+	const examStore = useExamStore;
 
-  const { exam, setExam } = useExamStore((state) => state);
-  const { exams, setExams } = useExamStore((state) => state);
-  const { sessionId, setSessionId } = useExamStore((state) => state);
-  const { partIndex, setPartIndex } = useExamStore((state) => state);
-  const { moduleIndex, setModuleIndex } = useExamStore((state) => state);
-  const { questionIndex, setQuestionIndex } = useExamStore((state) => state);
-  const { exerciseIndex, setExerciseIndex } = useExamStore((state) => state);
-  const { userSolutions, setUserSolutions } = useExamStore((state) => state);
-  const { showSolutions, setShowSolutions } = useExamStore((state) => state);
-  const { selectedModules, setSelectedModules } = useExamStore(
-    (state) => state,
-  );
+	const {exam, setExam} = useExamStore((state) => state);
+	const {exams, setExams} = useExamStore((state) => state);
+	const {sessionId, setSessionId} = useExamStore((state) => state);
+	const {partIndex, setPartIndex} = useExamStore((state) => state);
+	const {moduleIndex, setModuleIndex} = useExamStore((state) => state);
+	const {questionIndex, setQuestionIndex} = useExamStore((state) => state);
+	const {exerciseIndex, setExerciseIndex} = useExamStore((state) => state);
+	const {userSolutions, setUserSolutions} = useExamStore((state) => state);
+	const {showSolutions, setShowSolutions} = useExamStore((state) => state);
+	const {selectedModules, setSelectedModules} = useExamStore((state) => state);
 
-  const { user } = useUser({ redirectTo: "/login" });
-  const router = useRouter();
+	const {user} = useUser({redirectTo: "/login"});
+	const router = useRouter();
 
-  const reset = () => {
-    resetStore();
-    setVariant("full");
-    setAvoidRepeated(false);
-    setHasBeenUploaded(false);
-    setShowAbandonPopup(false);
-    setIsEvaluationLoading(false);
-    setStatsAwaitingEvaluation([]);
-    setTimeSpent(0);
-  };
+	const reset = () => {
+		resetStore();
+		setVariant("full");
+		setAvoidRepeated(false);
+		setHasBeenUploaded(false);
+		setShowAbandonPopup(false);
+		setIsEvaluationLoading(false);
+		setStatsAwaitingEvaluation([]);
+		setTimeSpent(0);
+	};
 
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const saveSession = async () => {
-    console.log("Saving your session...");
+	// eslint-disable-next-line react-hooks/exhaustive-deps
+	const saveSession = async () => {
+		console.log("Saving your session...");
 
-    await axios.post("/api/sessions", {
-      id: sessionId,
-      sessionId,
-      date: new Date().toISOString(),
-      userSolutions,
-      moduleIndex,
-      selectedModules,
-      assignment,
-      timeSpent,
-      exams,
-      exam,
-      partIndex,
-      exerciseIndex,
-      questionIndex,
-      user: user?.id,
-    });
-  };
+		await axios.post("/api/sessions", {
+			id: sessionId,
+			sessionId,
+			date: new Date().toISOString(),
+			userSolutions,
+			moduleIndex,
+			selectedModules,
+			assignment,
+			timeSpent,
+			exams,
+			exam,
+			partIndex,
+			exerciseIndex,
+			questionIndex,
+			user: user?.id,
+		});
+	};
 
-  useEffect(
-    () => setTimeSpent((prev) => prev + initialTimeSpent),
-    [initialTimeSpent],
-  );
+	useEffect(() => setTimeSpent((prev) => prev + initialTimeSpent), [initialTimeSpent]);
 
-  useEffect(() => {
-    if (userSolutions.length === 0 && exams.length > 0) {
-      const defaultSolutions = exams.map(defaultExamUserSolutions).flat();
-      setUserSolutions(defaultSolutions);
-    }
-  }, [exams, setUserSolutions, userSolutions]);
+	useEffect(() => {
+		if (userSolutions.length === 0 && exams.length > 0) {
+			const defaultSolutions = exams.map(defaultExamUserSolutions).flat();
+			setUserSolutions(defaultSolutions);
+		}
+	}, [exams, setUserSolutions, userSolutions]);
 
-  useEffect(() => {
-    if (
-      sessionId.length > 0 &&
-      userSolutions.length > 0 &&
-      selectedModules.length > 0 &&
-      exams.length > 0 &&
-      !!exam &&
-      timeSpent > 0 &&
-      !showSolutions &&
-      moduleIndex < selectedModules.length
-    )
-      saveSession();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    assignment,
-    exam,
-    exams,
-    moduleIndex,
-    selectedModules,
-    sessionId,
-    userSolutions,
-    user,
-    exerciseIndex,
-    partIndex,
-    questionIndex,
-  ]);
+	useEffect(() => {
+		if (
+			sessionId.length > 0 &&
+			userSolutions.length > 0 &&
+			selectedModules.length > 0 &&
+			exams.length > 0 &&
+			!!exam &&
+			timeSpent > 0 &&
+			!showSolutions &&
+			moduleIndex < selectedModules.length
+		)
+			saveSession();
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [assignment, exam, exams, moduleIndex, selectedModules, sessionId, userSolutions, user, exerciseIndex, partIndex, questionIndex]);
 
-  useEffect(() => {
-    if (
-      timeSpent % 20 === 0 &&
-      timeSpent > 0 &&
-      moduleIndex < selectedModules.length &&
-      !showSolutions
-    )
-      saveSession();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [timeSpent]);
+	useEffect(() => {
+		if (timeSpent % 20 === 0 && timeSpent > 0 && moduleIndex < selectedModules.length && !showSolutions) saveSession();
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [timeSpent]);
 
-  useEffect(() => {
-    if (selectedModules.length > 0 && sessionId.length === 0) {
-      const shortUID = new ShortUniqueId();
-      setSessionId(shortUID.randomUUID(8));
-    }
-  }, [setSessionId, selectedModules, sessionId]);
+	useEffect(() => {
+		if (selectedModules.length > 0 && sessionId.length === 0) {
+			const shortUID = new ShortUniqueId();
+			setSessionId(shortUID.randomUUID(8));
+		}
+	}, [setSessionId, selectedModules, sessionId]);
 
-  useEffect(() => {
-    if (user?.type === "developer") console.log(exam);
-  }, [exam, user]);
+	useEffect(() => {
+		if (user?.type === "developer") console.log(exam);
+	}, [exam, user]);
 
-  useEffect(() => {
-    if (selectedModules.length > 0 && timeSpent === 0 && !showSolutions) {
-      const timerInterval = setInterval(() => {
-        setTimeSpent((prev) => prev + 1);
-      }, 1000);
+	useEffect(() => {
+		if (selectedModules.length > 0 && timeSpent === 0 && !showSolutions) {
+			const timerInterval = setInterval(() => {
+				setTimeSpent((prev) => prev + 1);
+			}, 1000);
 
-      return () => {
-        clearInterval(timerInterval);
-      };
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedModules.length]);
+			return () => {
+				clearInterval(timerInterval);
+			};
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [selectedModules.length]);
 
-  useEffect(() => {
-    if (showSolutions) setModuleIndex(-1);
-  }, [setModuleIndex, showSolutions]);
+	useEffect(() => {
+		if (showSolutions) setModuleIndex(-1);
+	}, [setModuleIndex, showSolutions]);
 
-  useEffect(() => {
-    (async () => {
-      if (
-        selectedModules.length > 0 &&
-        exams.length > 0 &&
-        moduleIndex < selectedModules.length
-      ) {
-        const nextExam = exams[moduleIndex];
+	useEffect(() => {
+		(async () => {
+			if (selectedModules.length > 0 && exams.length > 0 && moduleIndex < selectedModules.length) {
+				const nextExam = exams[moduleIndex];
 
-        if (partIndex === -1 && nextExam.module !== "listening")
-          setPartIndex(0);
-        if (
-          exerciseIndex === -1 &&
-          !["reading", "listening"].includes(nextExam?.module)
-        )
-          setExerciseIndex(0);
-        setExam(nextExam ? updateExamWithUserSolutions(nextExam) : undefined);
-      }
-    })();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedModules, moduleIndex, exams]);
+				if (partIndex === -1 && nextExam.module !== "listening") setPartIndex(0);
+				if (exerciseIndex === -1 && !["reading", "listening"].includes(nextExam?.module)) setExerciseIndex(0);
+				setExam(nextExam ? updateExamWithUserSolutions(nextExam) : undefined);
+			}
+		})();
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [selectedModules, moduleIndex, exams]);
 
-  useEffect(() => {
-    (async () => {
-      if (selectedModules.length > 0 && exams.length === 0) {
-        const examPromises = selectedModules.map((module) =>
-          getExam(
-            module,
-            avoidRepeated,
-            variant,
-            user?.type === "student" || user?.type === "developer"
-              ? user.preferredGender
-              : undefined,
-          ),
-        );
-        Promise.all(examPromises).then((values) => {
-          if (values.every((x) => !!x)) {
-            setExams(values.map((x) => x!));
-          } else {
-            toast.error("Something went wrong, please try again");
-            setTimeout(router.reload, 500);
-          }
-        });
-      }
-    })();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedModules, setExams, exams]);
+	useEffect(() => {
+		(async () => {
+			if (selectedModules.length > 0 && exams.length === 0) {
+				const examPromises = selectedModules.map((module) =>
+					getExam(
+						module,
+						avoidRepeated,
+						variant,
+						user?.type === "student" || user?.type === "developer" ? user.preferredGender : undefined,
+					),
+				);
+				Promise.all(examPromises).then((values) => {
+					if (values.every((x) => !!x)) {
+						setExams(values.map((x) => x!));
+					} else {
+						toast.error("Something went wrong, please try again");
+						setTimeout(router.reload, 500);
+					}
+				});
+			}
+		})();
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [selectedModules, setExams, exams]);
 
-  useEffect(() => {
-    if (
-      selectedModules.length > 0 &&
-      exams.length !== 0 &&
-      moduleIndex >= selectedModules.length &&
-      !hasBeenUploaded &&
-      !showSolutions
-    ) {
-      const newStats: Stat[] = userSolutions.map((solution) => ({
-        ...solution,
-        id: solution.id || uuidv4(),
-        timeSpent,
-        session: sessionId,
-        exam: solution.exam!,
-        module: solution.module!,
-        user: user?.id || "",
-        date: new Date().getTime(),
-        isDisabled: solution.isDisabled,
-        ...(assignment ? { assignment: assignment.id } : {}),
-      }));
+	useEffect(() => {
+		if (selectedModules.length > 0 && exams.length !== 0 && moduleIndex >= selectedModules.length && !hasBeenUploaded && !showSolutions) {
+			const newStats: Stat[] = userSolutions.map((solution) => ({
+				...solution,
+				id: solution.id || uuidv4(),
+				timeSpent,
+				session: sessionId,
+				exam: solution.exam!,
+				module: solution.module!,
+				user: user?.id || "",
+				date: new Date().getTime(),
+				isDisabled: solution.isDisabled,
+				...(assignment ? {assignment: assignment.id} : {}),
+			}));
 
-      axios
-        .post<{ ok: boolean }>("/api/stats", newStats)
-        .then((response) => setHasBeenUploaded(response.data.ok))
-        .catch(() => setHasBeenUploaded(false));
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedModules, moduleIndex, hasBeenUploaded]);
+			axios
+				.post<{ok: boolean}>("/api/stats", newStats)
+				.then((response) => setHasBeenUploaded(response.data.ok))
+				.catch(() => setHasBeenUploaded(false));
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [selectedModules, moduleIndex, hasBeenUploaded]);
 
-  useEffect(() => {
-    setIsEvaluationLoading(statsAwaitingEvaluation.length !== 0);
-  }, [statsAwaitingEvaluation]);
+	useEffect(() => {
+		setIsEvaluationLoading(statsAwaitingEvaluation.length !== 0);
+	}, [statsAwaitingEvaluation]);
 
-  useEffect(() => {
-    if (statsAwaitingEvaluation.length > 0) {
-      checkIfStatsHaveBeenEvaluated(statsAwaitingEvaluation);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [statsAwaitingEvaluation]);
+	useEffect(() => {
+		if (statsAwaitingEvaluation.length > 0) {
+			checkIfStatsHaveBeenEvaluated(statsAwaitingEvaluation);
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [statsAwaitingEvaluation]);
 
-  const checkIfStatsHaveBeenEvaluated = (ids: string[]) => {
-    setTimeout(async () => {
-      try {
-        const awaitedStats = await Promise.all(
-          ids.map(
-            async (id) => (await axios.get<Stat>(`/api/stats/${id}`)).data,
-          ),
-        );
-        const solutionsEvaluated = awaitedStats.every((stat) =>
-          stat.solutions.every((x) => x.evaluation !== null),
-        );
-        if (solutionsEvaluated) {
-          const statsUserSolutions: UserSolution[] = awaitedStats.map(
-            (stat) => ({
-              id: stat.id,
-              exercise: stat.exercise,
-              score: stat.score,
-              solutions: stat.solutions,
-              type: stat.type,
-              exam: stat.exam,
-              module: stat.module,
-            }),
-          );
+	const checkIfStatsHaveBeenEvaluated = (ids: string[]) => {
+		setTimeout(async () => {
+			try {
+				const awaitedStats = await Promise.all(ids.map(async (id) => (await axios.get<Stat>(`/api/stats/${id}`)).data));
+				const solutionsEvaluated = awaitedStats.every((stat) => stat.solutions.every((x) => x.evaluation !== null));
+				if (solutionsEvaluated) {
+					const statsUserSolutions: UserSolution[] = awaitedStats.map((stat) => ({
+						id: stat.id,
+						exercise: stat.exercise,
+						score: stat.score,
+						solutions: stat.solutions,
+						type: stat.type,
+						exam: stat.exam,
+						module: stat.module,
+					}));
 
-          const updatedUserSolutions = userSolutions.map((x) => {
-            const respectiveSolution = statsUserSolutions.find(
-              (y) => y.exercise === x.exercise,
-            );
-            return respectiveSolution ? respectiveSolution : x;
-          });
+					const updatedUserSolutions = userSolutions.map((x) => {
+						const respectiveSolution = statsUserSolutions.find((y) => y.exercise === x.exercise);
+						return respectiveSolution ? respectiveSolution : x;
+					});
 
-          setUserSolutions(updatedUserSolutions);
-          return setStatsAwaitingEvaluation((prev) =>
-            prev.filter((x) => !ids.includes(x)),
-          );
-        }
+					setUserSolutions(updatedUserSolutions);
+					return setStatsAwaitingEvaluation((prev) => prev.filter((x) => !ids.includes(x)));
+				}
 
-        return checkIfStatsHaveBeenEvaluated(ids);
-      } catch {
-        return checkIfStatsHaveBeenEvaluated(ids);
-      }
-    }, 5 * 1000);
-  };
+				return checkIfStatsHaveBeenEvaluated(ids);
+			} catch {
+				return checkIfStatsHaveBeenEvaluated(ids);
+			}
+		}, 5 * 1000);
+	};
 
-  const updateExamWithUserSolutions = (exam: Exam): Exam => {
-    if (exam.module === "reading" || exam.module === "listening") {
-      const parts = exam.parts.map((p) =>
-        Object.assign(p, {
-          exercises: p.exercises.map((x) =>
-            Object.assign(x, {
-              userSolutions: userSolutions.find((y) => x.id === y.exercise)
-                ?.solutions,
-            }),
-          ),
-        }),
-      );
-      return Object.assign(exam, { parts });
-    }
+	const updateExamWithUserSolutions = (exam: Exam): Exam => {
+		if (exam.module === "reading" || exam.module === "listening") {
+			const parts = exam.parts.map((p) =>
+				Object.assign(p, {
+					exercises: p.exercises.map((x) =>
+						Object.assign(x, {
+							userSolutions: userSolutions.find((y) => x.id === y.exercise)?.solutions,
+						}),
+					),
+				}),
+			);
+			return Object.assign(exam, {parts});
+		}
 
-    const exercises = exam.exercises.map((x) =>
-      Object.assign(x, {
-        userSolutions: userSolutions.find((y) => x.id === y.exercise)
-          ?.solutions,
-      }),
-    );
-    return Object.assign(exam, { exercises });
-  };
+		const exercises = exam.exercises.map((x) =>
+			Object.assign(x, {
+				userSolutions: userSolutions.find((y) => x.id === y.exercise)?.solutions,
+			}),
+		);
+		return Object.assign(exam, {exercises});
+	};
 
-  const onFinish = async (solutions: UserSolution[]) => {
-    const solutionIds = solutions.map((x) => x.exercise);
-    const solutionExams = solutions.map((x) => x.exam);
+	const onFinish = async (solutions: UserSolution[]) => {
+		const solutionIds = solutions.map((x) => x.exercise);
+		const solutionExams = solutions.map((x) => x.exam);
 
-    let newSolutions = [...solutions];
+		let newSolutions = [...solutions];
 
-    if (exam && !solutionExams.includes(exam.id)) return;
+		if (exam && !solutionExams.includes(exam.id)) return;
 
-    if (
-      exam &&
-      (exam.module === "writing" || exam.module === "speaking") &&
-      solutions.length > 0 &&
-      !showSolutions
-    ) {
-      setHasBeenUploaded(true);
-      setIsEvaluationLoading(true);
+		if (exam && (exam.module === "writing" || exam.module === "speaking") && solutions.length > 0 && !showSolutions) {
+			setHasBeenUploaded(true);
+			setIsEvaluationLoading(true);
 
-      const responses: UserSolution[] = (
-        await Promise.all(
-          exam.exercises.map(async (exercise, index) => {
-            const evaluationID = uuidv4();
-            if (exercise.type === "writing")
-              return await evaluateWritingAnswer(
-                exercise,
-                index + 1,
-                solutions.find((x) => x.exercise === exercise.id)!,
-                evaluationID,
-              );
+			const responses: UserSolution[] = (
+				await Promise.all(
+					exam.exercises.map(async (exercise, index) => {
+						const evaluationID = uuidv4();
+						if (exercise.type === "writing")
+							return await evaluateWritingAnswer(exercise, index + 1, solutions.find((x) => x.exercise === exercise.id)!, evaluationID);
 
-            if (
-              exercise.type === "interactiveSpeaking" ||
-              exercise.type === "speaking"
-            )
-              return await evaluateSpeakingAnswer(
-                exercise,
-                solutions.find((x) => x.exercise === exercise.id)!,
-                evaluationID,
-              );
-          }),
-        )
-      ).filter((x) => !!x) as UserSolution[];
+						if (exercise.type === "interactiveSpeaking" || exercise.type === "speaking")
+							return await evaluateSpeakingAnswer(
+								exercise,
+								solutions.find((x) => x.exercise === exercise.id)!,
+								evaluationID,
+								index === 0 ? 1 : 2,
+							);
+					}),
+				)
+			).filter((x) => !!x) as UserSolution[];
 
-      newSolutions = [
-        ...newSolutions.filter(
-          (x) => !responses.map((y) => y.exercise).includes(x.exercise),
-        ),
-        ...responses,
-      ];
-      setStatsAwaitingEvaluation((prev) => [
-        ...prev,
-        ...responses.filter((x) => !!x).map((r) => (r as any).id),
-      ]);
-      setHasBeenUploaded(false);
-    }
+			newSolutions = [...newSolutions.filter((x) => !responses.map((y) => y.exercise).includes(x.exercise)), ...responses];
+			setStatsAwaitingEvaluation((prev) => [...prev, ...responses.filter((x) => !!x).map((r) => (r as any).id)]);
+			setHasBeenUploaded(false);
+		}
 
-    axios.get("/api/stats/update");
+		axios.get("/api/stats/update");
 
-    setUserSolutions([
-      ...userSolutions.filter((x) => !solutionIds.includes(x.exercise)),
-      ...newSolutions,
-    ]);
-    setModuleIndex(moduleIndex + 1);
+		setUserSolutions([...userSolutions.filter((x) => !solutionIds.includes(x.exercise)), ...newSolutions]);
+		setModuleIndex(moduleIndex + 1);
 
-    setPartIndex(-1);
-    setExerciseIndex(-1);
-    setQuestionIndex(0);
-  };
+		setPartIndex(-1);
+		setExerciseIndex(-1);
+		setQuestionIndex(0);
+	};
 
-  const aggregateScoresByModule = (): {
-    module: Module;
-    total: number;
-    missing: number;
-    correct: number;
-  }[] => {
-    const scores: {
-      [key in Module]: { total: number; missing: number; correct: number };
-    } = {
-      reading: {
-        total: 0,
-        correct: 0,
-        missing: 0,
-      },
-      listening: {
-        total: 0,
-        correct: 0,
-        missing: 0,
-      },
-      writing: {
-        total: 0,
-        correct: 0,
-        missing: 0,
-      },
-      speaking: {
-        total: 0,
-        correct: 0,
-        missing: 0,
-      },
-      level: {
-        total: 0,
-        correct: 0,
-        missing: 0,
-      },
-    };
+	const aggregateScoresByModule = (): {
+		module: Module;
+		total: number;
+		missing: number;
+		correct: number;
+	}[] => {
+		const scores: {
+			[key in Module]: {total: number; missing: number; correct: number};
+		} = {
+			reading: {
+				total: 0,
+				correct: 0,
+				missing: 0,
+			},
+			listening: {
+				total: 0,
+				correct: 0,
+				missing: 0,
+			},
+			writing: {
+				total: 0,
+				correct: 0,
+				missing: 0,
+			},
+			speaking: {
+				total: 0,
+				correct: 0,
+				missing: 0,
+			},
+			level: {
+				total: 0,
+				correct: 0,
+				missing: 0,
+			},
+		};
 
-    userSolutions.forEach((x) => {
-      const examModule =
-        x.module ||
-        (x.type === "writing"
-          ? "writing"
-          : x.type === "speaking" || x.type === "interactiveSpeaking"
-            ? "speaking"
-            : undefined);
+		userSolutions.forEach((x) => {
+			const examModule =
+				x.module || (x.type === "writing" ? "writing" : x.type === "speaking" || x.type === "interactiveSpeaking" ? "speaking" : undefined);
 
-      scores[examModule!] = {
-        total: scores[examModule!].total + x.score.total,
-        correct: scores[examModule!].correct + x.score.correct,
-        missing: scores[examModule!].missing + x.score.missing,
-      };
-    });
+			scores[examModule!] = {
+				total: scores[examModule!].total + x.score.total,
+				correct: scores[examModule!].correct + x.score.correct,
+				missing: scores[examModule!].missing + x.score.missing,
+			};
+		});
 
-    return Object.keys(scores)
-      .filter((x) => scores[x as Module].total > 0)
-      .map((x) => ({ module: x as Module, ...scores[x as Module] }));
-  };
+		return Object.keys(scores)
+			.filter((x) => scores[x as Module].total > 0)
+			.map((x) => ({module: x as Module, ...scores[x as Module]}));
+	};
 
-  const renderScreen = () => {
-    if (selectedModules.length === 0) {
-      return (
-        <Selection
-          page={page}
-          user={user!}
-          disableSelection={page === "exams"}
-          onStart={(modules: Module[], avoid: boolean, variant: Variant) => {
-            setModuleIndex(0);
-            setAvoidRepeated(avoid);
-            setSelectedModules(modules);
-            setVariant(variant);
-          }}
-        />
-      );
-    }
+	const renderScreen = () => {
+		if (selectedModules.length === 0) {
+			return (
+				<Selection
+					page={page}
+					user={user!}
+					disableSelection={page === "exams"}
+					onStart={(modules: Module[], avoid: boolean, variant: Variant) => {
+						setModuleIndex(0);
+						setAvoidRepeated(avoid);
+						setSelectedModules(modules);
+						setVariant(variant);
+					}}
+				/>
+			);
+		}
 
-    if (moduleIndex >= selectedModules.length || moduleIndex === -1) {
-      return (
-        <Finish
-          isLoading={isEvaluationLoading}
-          user={user!}
-          modules={selectedModules}
-          onViewResults={(index?: number) => {
-            setShowSolutions(true);
-            setModuleIndex(index || 0);
-            setExerciseIndex(
-              ["reading", "listening"].includes(exams[0].module) ? -1 : 0,
-            );
-            setPartIndex(exams[0].module === "listening" ? -1 : 0);
-            setExam(exams[0]);
-          }}
-          scores={aggregateScoresByModule()}
-        />
-      );
-    }
+		if (moduleIndex >= selectedModules.length || moduleIndex === -1) {
+			return (
+				<Finish
+					isLoading={isEvaluationLoading}
+					user={user!}
+					modules={selectedModules}
+					onViewResults={(index?: number) => {
+						setShowSolutions(true);
+						setModuleIndex(index || 0);
+						setExerciseIndex(["reading", "listening"].includes(exams[0].module) ? -1 : 0);
+						setPartIndex(exams[0].module === "listening" ? -1 : 0);
+						setExam(exams[0]);
+					}}
+					scores={aggregateScoresByModule()}
+				/>
+			);
+		}
 
-    if (exam && exam.module === "reading") {
-      return (
-        <Reading
-          exam={exam}
-          onFinish={onFinish}
-          showSolutions={showSolutions}
-        />
-      );
-    }
+		if (exam && exam.module === "reading") {
+			return <Reading exam={exam} onFinish={onFinish} showSolutions={showSolutions} />;
+		}
 
-    if (exam && exam.module === "listening") {
-      return (
-        <Listening
-          exam={exam}
-          onFinish={onFinish}
-          showSolutions={showSolutions}
-        />
-      );
-    }
+		if (exam && exam.module === "listening") {
+			return <Listening exam={exam} onFinish={onFinish} showSolutions={showSolutions} />;
+		}
 
-    if (exam && exam.module === "writing") {
-      return (
-        <Writing
-          exam={exam}
-          onFinish={onFinish}
-          showSolutions={showSolutions}
-        />
-      );
-    }
+		if (exam && exam.module === "writing") {
+			return <Writing exam={exam} onFinish={onFinish} showSolutions={showSolutions} />;
+		}
 
-    if (exam && exam.module === "speaking") {
-      return (
-        <Speaking
-          exam={exam}
-          onFinish={onFinish}
-          showSolutions={showSolutions}
-        />
-      );
-    }
+		if (exam && exam.module === "speaking") {
+			return <Speaking exam={exam} onFinish={onFinish} showSolutions={showSolutions} />;
+		}
 
-    if (exam && exam.module === "level") {
-      return (
-        <Level exam={exam} onFinish={onFinish} showSolutions={showSolutions} />
-      );
-    }
+		if (exam && exam.module === "level") {
+			return <Level exam={exam} onFinish={onFinish} showSolutions={showSolutions} />;
+		}
 
-    return <>Loading...</>;
-  };
+		return <>Loading...</>;
+	};
 
-  return (
-    <>
-      <ToastContainer />
-      {user && (
-        <Layout
-          user={user}
-          className="justify-between"
-          focusMode={
-            selectedModules.length !== 0 &&
-            !showSolutions &&
-            moduleIndex < selectedModules.length
-          }
-          onFocusLayerMouseEnter={() => setShowAbandonPopup(true)}
-        >
-          <>
-            {renderScreen()}
-            {!showSolutions && moduleIndex < selectedModules.length && (
-              <AbandonPopup
-                isOpen={showAbandonPopup}
-                abandonPopupTitle="Leave Exercise"
-                abandonPopupDescription="Are you sure you want to leave the exercise? Your progress will be saved and this exam can be resumed on the Dashboard."
-                abandonConfirmButtonText="Confirm"
-                onAbandon={() => {
-                  reset();
-                }}
-                onCancel={() => setShowAbandonPopup(false)}
-              />
-            )}
-          </>
-        </Layout>
-      )}
-    </>
-  );
+	return (
+		<>
+			<ToastContainer />
+			{user && (
+				<Layout
+					user={user}
+					className="justify-between"
+					focusMode={selectedModules.length !== 0 && !showSolutions && moduleIndex < selectedModules.length}
+					onFocusLayerMouseEnter={() => setShowAbandonPopup(true)}>
+					<>
+						{renderScreen()}
+						{!showSolutions && moduleIndex < selectedModules.length && (
+							<AbandonPopup
+								isOpen={showAbandonPopup}
+								abandonPopupTitle="Leave Exercise"
+								abandonPopupDescription="Are you sure you want to leave the exercise? Your progress will be saved and this exam can be resumed on the Dashboard."
+								abandonConfirmButtonText="Confirm"
+								onAbandon={() => {
+									reset();
+								}}
+								onCancel={() => setShowAbandonPopup(false)}
+							/>
+						)}
+					</>
+				</Layout>
+			)}
+		</>
+	);
 }
diff --git a/src/pages/(status)/PaymentDue.tsx b/src/pages/(status)/PaymentDue.tsx
index 1285d041..a1fba804 100644
--- a/src/pages/(status)/PaymentDue.tsx
+++ b/src/pages/(status)/PaymentDue.tsx
@@ -121,12 +121,12 @@ export default function PaymentDue({user, hasExpired = false, clientID, reload}:
 												</span>
 											</div>
 											<div className="flex w-full flex-col items-start gap-2">
-												{!appliedDiscount && (
+												{appliedDiscount === 0 && (
 													<span className="text-2xl">
 														{p.price} {p.currency}
 													</span>
 												)}
-												{appliedDiscount && (
+												{appliedDiscount > 0 && (
 													<div className="flex items-center gap-2">
 														<span className="text-2xl line-through">
 															{p.price} {p.currency}
diff --git a/src/pages/api/evaluate/speaking.ts b/src/pages/api/evaluate/speaking.ts
index 79293783..3f9431b9 100644
--- a/src/pages/api/evaluate/speaking.ts
+++ b/src/pages/api/evaluate/speaking.ts
@@ -30,6 +30,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 
 		const audioFile = files.audio;
 		const audioFileRef = ref(storage, `speaking_recordings/${fields.id}.wav`);
+		const task = parseInt(fields.task.toString());
 
 		const binary = fs.readFileSync((audioFile as any).path).buffer;
 		const snapshot = await uploadBytes(audioFileRef, binary);
@@ -39,7 +40,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 		res.status(200).json(null);
 
 		console.log("🌱 - Still processing");
-		const backendRequest = await evaluate({answers: [{question: fields.question, answer: path}]});
+		const backendRequest = await evaluate({answer: path, question: fields.question}, task);
 		console.log("🌱 - Process complete");
 
 		const correspondingStat = await getCorrespondingStat(fields.id, 1);
@@ -76,14 +77,14 @@ async function getCorrespondingStat(id: string, index: number): Promise<Stat> {
 	return getCorrespondingStat(id, index + 1);
 }
 
-async function evaluate(body: {answers: object[]}): Promise<AxiosResponse> {
-	const backendRequest = await axios.post(`${process.env.BACKEND_URL}/speaking_task_3`, body, {
+async function evaluate(body: {answer: string; question: string}, task: number): Promise<AxiosResponse> {
+	const backendRequest = await axios.post(`${process.env.BACKEND_URL}/speaking_task_${task}`, body, {
 		headers: {
 			Authorization: `Bearer ${process.env.BACKEND_JWT}`,
 		},
 	});
 
-	if (typeof backendRequest.data === "string") return evaluate(body);
+	if (typeof backendRequest.data === "string") return evaluate(body, task);
 	return backendRequest;
 }
 
diff --git a/src/pages/api/users/update.ts b/src/pages/api/users/update.ts
index bbd1b75c..5fd6f8e7 100644
--- a/src/pages/api/users/update.ts
+++ b/src/pages/api/users/update.ts
@@ -90,7 +90,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 		if (updatedUser.status || updatedUser.type === "corporate") {
 			// there's no await as this does not affect the user
 			propagateStatusChange(queryId, updatedUser.status);
-			propagateExpiryDateChanges(queryId, user.subscriptionExpirationDate || null, updatedUser.subscriptionExpirationDate || null);
+			propagateExpiryDateChanges(queryId, user.subscriptionExpirationDate, updatedUser.subscriptionExpirationDate || null);
 		}
 
 		res.status(200).json({ok: true});
diff --git a/src/pages/profile.tsx b/src/pages/profile.tsx
index dbc2ca9d..2548b9c6 100644
--- a/src/pages/profile.tsx
+++ b/src/pages/profile.tsx
@@ -1,783 +1,655 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
-import { withIronSessionSsr } from "iron-session/next";
-import { sessionOptions } from "@/lib/session";
-import {
-  ChangeEvent,
-  Dispatch,
-  ReactNode,
-  SetStateAction,
-  useEffect,
-  useRef,
-  useState,
-} from "react";
+import {withIronSessionSsr} from "iron-session/next";
+import {sessionOptions} from "@/lib/session";
+import {ChangeEvent, Dispatch, ReactNode, SetStateAction, useEffect, useRef, useState} from "react";
 import useUser from "@/hooks/useUser";
-import { toast, ToastContainer } from "react-toastify";
+import {toast, ToastContainer} from "react-toastify";
 import Layout from "@/components/High/Layout";
 import Input from "@/components/Low/Input";
 import Button from "@/components/Low/Button";
 import Link from "next/link";
 import axios from "axios";
-import { ErrorMessage } from "@/constants/errors";
+import {ErrorMessage} from "@/constants/errors";
 import clsx from "clsx";
-import {
-  CorporateUser,
-  EmploymentStatus,
-  EMPLOYMENT_STATUS,
-  Gender,
-  User,
-} from "@/interfaces/user";
+import {CorporateUser, EmploymentStatus, EMPLOYMENT_STATUS, Gender, User} from "@/interfaces/user";
 import CountrySelect from "@/components/Low/CountrySelect";
-import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import moment from "moment";
-import { BsCamera, BsQuestionCircleFill } from "react-icons/bs";
-import { USER_TYPE_LABELS } from "@/resources/user";
+import {BsCamera, BsQuestionCircleFill} from "react-icons/bs";
+import {USER_TYPE_LABELS} from "@/resources/user";
 import useGroups from "@/hooks/useGroups";
 import useUsers from "@/hooks/useUsers";
-import { convertBase64 } from "@/utils";
-import { Divider } from "primereact/divider";
+import {convertBase64} from "@/utils";
+import {Divider} from "primereact/divider";
 import GenderInput from "@/components/High/GenderInput";
 import EmploymentStatusInput from "@/components/High/EmploymentStatusInput";
 import TimezoneSelect from "@/components/Low/TImezoneSelect";
 import Modal from "@/components/Modal";
-import { Module } from "@/interfaces";
+import {Module} from "@/interfaces";
 import ModuleLevelSelector from "@/components/Medium/ModuleLevelSelector";
 import Select from "@/components/Low/Select";
-import { InstructorGender } from "@/interfaces/exam";
-import { capitalize } from "lodash";
+import {InstructorGender} from "@/interfaces/exam";
+import {capitalize} from "lodash";
 import TopicModal from "@/components/Medium/TopicModal";
-import { v4 } from "uuid";
-export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
-  const user = req.session.user;
+import {v4} from "uuid";
+export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+	const user = req.session.user;
 
-  if (!user || !user.isVerified) {
-    return {
-      redirect: {
-        destination: "/login",
-        permanent: false,
-      },
-    };
-  }
+	if (!user || !user.isVerified) {
+		return {
+			redirect: {
+				destination: "/login",
+				permanent: false,
+			},
+		};
+	}
 
-  if (shouldRedirectHome(user)) {
-    return {
-      redirect: {
-        destination: "/",
-        permanent: false,
-      },
-    };
-  }
+	if (shouldRedirectHome(user)) {
+		return {
+			redirect: {
+				destination: "/",
+				permanent: false,
+			},
+		};
+	}
 
-  return {
-    props: { user: req.session.user },
-  };
+	return {
+		props: {user: req.session.user},
+	};
 }, sessionOptions);
 
 interface Props {
-  user: User;
-  mutateUser: Function;
+	user: User;
+	mutateUser: Function;
 }
 
-const DoubleColumnRow = ({ children }: { children: ReactNode }) => (
-  <div className="flex flex-col lg:flex-row gap-8 w-full">{children}</div>
-);
+const DoubleColumnRow = ({children}: {children: ReactNode}) => <div className="flex flex-col lg:flex-row gap-8 w-full">{children}</div>;
 
-function UserProfile({ user, mutateUser }: Props) {
-  const [bio, setBio] = useState(user.bio || "");
-  const [name, setName] = useState(user.name || "");
-  const [email, setEmail] = useState(user.email || "");
-  const [password, setPassword] = useState("");
-  const [newPassword, setNewPassword] = useState("");
-  const [isLoading, setIsLoading] = useState(false);
-  const [profilePicture, setProfilePicture] = useState(user.profilePicture);
+function UserProfile({user, mutateUser}: Props) {
+	const [bio, setBio] = useState(user.bio || "");
+	const [name, setName] = useState(user.name || "");
+	const [email, setEmail] = useState(user.email || "");
+	const [password, setPassword] = useState("");
+	const [newPassword, setNewPassword] = useState("");
+	const [isLoading, setIsLoading] = useState(false);
+	const [profilePicture, setProfilePicture] = useState(user.profilePicture);
 
-  const [desiredLevels, setDesiredLevels] = useState<
-    { [key in Module]: number } | undefined
-  >(
-    ["developer", "student"].includes(user.type)
-      ? user.desiredLevels
-      : undefined,
-  );
+	const [desiredLevels, setDesiredLevels] = useState<{[key in Module]: number} | undefined>(
+		["developer", "student"].includes(user.type) ? user.desiredLevels : undefined,
+	);
+	const [focus, setFocus] = useState<"academic" | "general">(user.focus);
 
-  const [country, setCountry] = useState<string>(
-    user.demographicInformation?.country || "",
-  );
-  const [phone, setPhone] = useState<string>(
-    user.demographicInformation?.phone || "",
-  );
-  const [gender, setGender] = useState<Gender | undefined>(
-    user.demographicInformation?.gender || undefined,
-  );
-  const [employment, setEmployment] = useState<EmploymentStatus | undefined>(
-    user.type === "corporate"
-      ? undefined
-      : user.demographicInformation?.employment,
-  );
-  const [passport_id, setPassportID] = useState<string | undefined>(
-    user.type === "student"
-      ? user.demographicInformation?.passport_id
-      : undefined,
-  );
+	const [country, setCountry] = useState<string>(user.demographicInformation?.country || "");
+	const [phone, setPhone] = useState<string>(user.demographicInformation?.phone || "");
+	const [gender, setGender] = useState<Gender | undefined>(user.demographicInformation?.gender || undefined);
+	const [employment, setEmployment] = useState<EmploymentStatus | undefined>(
+		user.type === "corporate" ? undefined : user.demographicInformation?.employment,
+	);
+	const [passport_id, setPassportID] = useState<string | undefined>(user.type === "student" ? user.demographicInformation?.passport_id : undefined);
 
-  const [preferredGender, setPreferredGender] = useState<
-    InstructorGender | undefined
-  >(
-    user.type === "student" || user.type === "developer"
-      ? user.preferredGender || "varied"
-      : undefined,
-  );
-  const [preferredTopics, setPreferredTopics] = useState<string[] | undefined>(
-    user.type === "student" || user.type === "developer"
-      ? user.preferredTopics
-      : undefined,
-  );
+	const [preferredGender, setPreferredGender] = useState<InstructorGender | undefined>(
+		user.type === "student" || user.type === "developer" ? user.preferredGender || "varied" : undefined,
+	);
+	const [preferredTopics, setPreferredTopics] = useState<string[] | undefined>(
+		user.type === "student" || user.type === "developer" ? user.preferredTopics : undefined,
+	);
 
-  const [position, setPosition] = useState<string | undefined>(
-    user.type === "corporate"
-      ? user.demographicInformation?.position
-      : undefined,
-  );
-  const [corporateInformation, setCorporateInformation] = useState(
-    user.type === "corporate" ? user.corporateInformation : undefined,
-  );
-  const [companyName, setCompanyName] = useState<string | undefined>(
-    user.type === "agent" ? user.agentInformation?.companyName : undefined,
-  );
-  const [commercialRegistration, setCommercialRegistration] = useState<
-    string | undefined
-  >(
-    user.type === "agent"
-      ? user.agentInformation?.commercialRegistration
-      : undefined,
-  );
-  const [arabName, setArabName] = useState<string | undefined>(
-    user.type === "agent" ? user.agentInformation?.companyArabName : undefined,
-  );
+	const [position, setPosition] = useState<string | undefined>(user.type === "corporate" ? user.demographicInformation?.position : undefined);
+	const [corporateInformation, setCorporateInformation] = useState(user.type === "corporate" ? user.corporateInformation : undefined);
+	const [companyName, setCompanyName] = useState<string | undefined>(user.type === "agent" ? user.agentInformation?.companyName : undefined);
+	const [commercialRegistration, setCommercialRegistration] = useState<string | undefined>(
+		user.type === "agent" ? user.agentInformation?.commercialRegistration : undefined,
+	);
+	const [arabName, setArabName] = useState<string | undefined>(user.type === "agent" ? user.agentInformation?.companyArabName : undefined);
 
-  const [timezone, setTimezone] = useState<string>(
-    user.demographicInformation?.timezone || moment.tz.guess(),
-  );
+	const [timezone, setTimezone] = useState<string>(user.demographicInformation?.timezone || moment.tz.guess());
 
-  const [isPreferredTopicsOpen, setIsPreferredTopicsOpen] = useState(false);
+	const [isPreferredTopicsOpen, setIsPreferredTopicsOpen] = useState(false);
 
-  const { groups } = useGroups();
-  const { users } = useUsers();
+	const {groups} = useGroups();
+	const {users} = useUsers();
 
-  const profilePictureInput = useRef(null);
-  const expirationDateColor = (date: Date) => {
-    const momentDate = moment(date);
-    const today = moment(new Date());
+	const profilePictureInput = useRef(null);
+	const expirationDateColor = (date: Date) => {
+		const momentDate = moment(date);
+		const today = moment(new Date());
 
-    if (today.add(1, "days").isAfter(momentDate))
-      return "!bg-mti-red-ultralight border-mti-red-light";
-    if (today.add(3, "days").isAfter(momentDate))
-      return "!bg-mti-rose-ultralight border-mti-rose-light";
-    if (today.add(7, "days").isAfter(momentDate))
-      return "!bg-mti-orange-ultralight border-mti-orange-light";
-  };
+		if (today.add(1, "days").isAfter(momentDate)) return "!bg-mti-red-ultralight border-mti-red-light";
+		if (today.add(3, "days").isAfter(momentDate)) return "!bg-mti-rose-ultralight border-mti-rose-light";
+		if (today.add(7, "days").isAfter(momentDate)) return "!bg-mti-orange-ultralight border-mti-orange-light";
+	};
 
-  const uploadProfilePicture = async (event: ChangeEvent<HTMLInputElement>) => {
-    if (event.target.files && event.target.files[0]) {
-      const picture = event.target.files[0];
-      const base64 = await convertBase64(picture);
-      setProfilePicture(base64 as string);
-    }
-  };
+	const uploadProfilePicture = async (event: ChangeEvent<HTMLInputElement>) => {
+		if (event.target.files && event.target.files[0]) {
+			const picture = event.target.files[0];
+			const base64 = await convertBase64(picture);
+			setProfilePicture(base64 as string);
+		}
+	};
 
-  const updateUser = async () => {
-    setIsLoading(true);
-    if (email !== user?.email && !password) {
-      toast.error("To update your e-mail you need to input your password!");
-      setIsLoading(false);
-      return;
-    }
+	const updateUser = async () => {
+		setIsLoading(true);
+		if (email !== user?.email && !password) {
+			toast.error("To update your e-mail you need to input your password!");
+			setIsLoading(false);
+			return;
+		}
 
-    if (newPassword && !password) {
-      toast.error(
-        "To update your password you need to input your current one!",
-      );
-      setIsLoading(false);
-      return;
-    }
+		if (newPassword && !password) {
+			toast.error("To update your password you need to input your current one!");
+			setIsLoading(false);
+			return;
+		}
 
-    if (email !== user?.email) {
-      const userAdmins = groups
-        .filter((x) => x.participants.includes(user.id))
-        .map((x) => x.admin);
-      const message =
-        users.filter((x) => userAdmins.includes(x.id) && x.type === "corporate")
-          .length > 0
-          ? "If you change your e-mail address, you will lose all benefits from your university/institute. Are you sure you want to continue?"
-          : "Are you sure you want to update your e-mail address?";
+		if (email !== user?.email) {
+			const userAdmins = groups.filter((x) => x.participants.includes(user.id)).map((x) => x.admin);
+			const message =
+				users.filter((x) => userAdmins.includes(x.id) && x.type === "corporate").length > 0
+					? "If you change your e-mail address, you will lose all benefits from your university/institute. Are you sure you want to continue?"
+					: "Are you sure you want to update your e-mail address?";
 
-      if (!confirm(message)) {
-        setIsLoading(false);
-        return;
-      }
-    }
+			if (!confirm(message)) {
+				setIsLoading(false);
+				return;
+			}
+		}
 
-    axios
-      .post("/api/users/update", {
-        bio,
-        name,
-        email,
-        password,
-        newPassword,
-        profilePicture,
-        desiredLevels,
-        preferredGender,
-        preferredTopics,
-        demographicInformation: {
-          phone,
-          country,
-          employment: user?.type === "corporate" ? undefined : employment,
-          position: user?.type === "corporate" ? position : undefined,
-          gender,
-          passport_id,
-          timezone,
-        },
-        ...(user.type === "corporate" ? { corporateInformation } : {}),
-        ...(user.type === "agent"
-          ? {
-              agentInformation: {
-                companyName,
-                commercialRegistration,
-                arabName,
-              },
-            }
-          : {}),
-      })
-      .then((response) => {
-        if (response.status === 200) {
-          toast.success("Your profile has been updated!");
-          mutateUser((response.data as { user: User }).user);
-          setIsLoading(false);
-          return;
-        }
-      })
-      .catch((error) => {
-        console.log(error);
-        toast.error((error.response.data as ErrorMessage).message);
-      })
-      .finally(() => {
-        setIsLoading(false);
-      });
-  };
+		axios
+			.post("/api/users/update", {
+				bio,
+				name,
+				email,
+				password,
+				newPassword,
+				profilePicture,
+				desiredLevels,
+				preferredGender,
+				preferredTopics,
+				focus,
+				demographicInformation: {
+					phone,
+					country,
+					employment: user?.type === "corporate" ? undefined : employment,
+					position: user?.type === "corporate" ? position : undefined,
+					gender,
+					passport_id,
+					timezone,
+				},
+				...(user.type === "corporate" ? {corporateInformation} : {}),
+				...(user.type === "agent"
+					? {
+							agentInformation: {
+								companyName,
+								commercialRegistration,
+								arabName,
+							},
+					  }
+					: {}),
+			})
+			.then((response) => {
+				if (response.status === 200) {
+					toast.success("Your profile has been updated!");
+					mutateUser((response.data as {user: User}).user);
+					setIsLoading(false);
+					return;
+				}
+			})
+			.catch((error) => {
+				console.log(error);
+				toast.error((error.response.data as ErrorMessage).message);
+			})
+			.finally(() => {
+				setIsLoading(false);
+			});
+	};
 
-  const ExpirationDate = () => (
-    <div className="flex flex-col gap-3 w-full">
-      <label className="font-normal text-base text-mti-gray-dim">
-        Expiry Date (click to purchase)
-      </label>
-      <Link
-        href="/payment"
-        className={clsx(
-          "p-6 w-full flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-          "transition duration-300 ease-in-out",
-          !user.subscriptionExpirationDate
-            ? "!bg-mti-green-ultralight !border-mti-green-light"
-            : expirationDateColor(user.subscriptionExpirationDate),
-          "bg-white border-mti-gray-platinum",
-        )}
-      >
-        {!user.subscriptionExpirationDate && "Unlimited"}
-        {user.subscriptionExpirationDate &&
-          moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
-      </Link>
-    </div>
-  );
+	const ExpirationDate = () => (
+		<div className="flex flex-col gap-3 w-full">
+			<label className="font-normal text-base text-mti-gray-dim">Expiry Date (click to purchase)</label>
+			<Link
+				href="/payment"
+				className={clsx(
+					"p-6 w-full flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
+					"transition duration-300 ease-in-out",
+					!user.subscriptionExpirationDate
+						? "!bg-mti-green-ultralight !border-mti-green-light"
+						: expirationDateColor(user.subscriptionExpirationDate),
+					"bg-white border-mti-gray-platinum",
+				)}>
+				{!user.subscriptionExpirationDate && "Unlimited"}
+				{user.subscriptionExpirationDate && moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
+			</Link>
+		</div>
+	);
 
-  const TimezoneInput = () => (
-    <div className="flex flex-col gap-3 w-full">
-      <label className="font-normal text-base text-mti-gray-dim">
-        Timezone
-      </label>
-      <TimezoneSelect value={timezone} onChange={setTimezone} />
-    </div>
-  );
+	const TimezoneInput = () => (
+		<div className="flex flex-col gap-3 w-full">
+			<label className="font-normal text-base text-mti-gray-dim">Timezone</label>
+			<TimezoneSelect value={timezone} onChange={setTimezone} />
+		</div>
+	);
 
-  const manualDownloadLink = ["student", "teacher", "corporate"].includes(
-    user.type,
-  )
-    ? `/manuals/${user.type}.pdf`
-    : "";
+	const manualDownloadLink = ["student", "teacher", "corporate"].includes(user.type) ? `/manuals/${user.type}.pdf` : "";
 
-  return (
-    <Layout user={user}>
-      <section className="w-full flex flex-col gap-4 md:gap-8 px-4 py-8">
-        <h1 className="text-4xl font-bold mb-6 md:hidden">Edit Profile</h1>
-        <div className="flex -md:flex-col-reverse -md:items-center w-full justify-between">
-          <div className="flex flex-col gap-8 w-full md:w-2/3">
-            <h1 className="text-4xl font-bold mb-6 -md:hidden">Edit Profile</h1>
-            <form
-              className="flex flex-col items-center gap-6 w-full"
-              onSubmit={(e) => e.preventDefault()}
-            >
-              <DoubleColumnRow>
-                {user.type !== "corporate" ? (
-                  <Input
-                    label={user.type === "agent" ? "English name" : "Name"}
-                    type="text"
-                    name="name"
-                    onChange={(e) => setName(e)}
-                    placeholder="Enter your name"
-                    defaultValue={name}
-                    required
-                  />
-                ) : (
-                  <Input
-                    label="Company name"
-                    type="text"
-                    name="name"
-                    onChange={(e) =>
-                      setCorporateInformation((prev) => ({
-                        ...prev!,
-                        companyInformation: {
-                          ...prev!.companyInformation,
-                          name: e,
-                        },
-                      }))
-                    }
-                    placeholder="Enter your company's name"
-                    defaultValue={corporateInformation?.companyInformation.name}
-                    required
-                  />
-                )}
+	return (
+		<Layout user={user}>
+			<section className="w-full flex flex-col gap-4 md:gap-8 px-4 py-8">
+				<h1 className="text-4xl font-bold mb-6 md:hidden">Edit Profile</h1>
+				<div className="flex -md:flex-col-reverse -md:items-center w-full justify-between">
+					<div className="flex flex-col gap-8 w-full md:w-2/3">
+						<h1 className="text-4xl font-bold mb-6 -md:hidden">Edit Profile</h1>
+						<form className="flex flex-col items-center gap-6 w-full" onSubmit={(e) => e.preventDefault()}>
+							<DoubleColumnRow>
+								{user.type !== "corporate" ? (
+									<Input
+										label={user.type === "agent" ? "English name" : "Name"}
+										type="text"
+										name="name"
+										onChange={(e) => setName(e)}
+										placeholder="Enter your name"
+										defaultValue={name}
+										required
+									/>
+								) : (
+									<Input
+										label="Company name"
+										type="text"
+										name="name"
+										onChange={(e) =>
+											setCorporateInformation((prev) => ({
+												...prev!,
+												companyInformation: {
+													...prev!.companyInformation,
+													name: e,
+												},
+											}))
+										}
+										placeholder="Enter your company's name"
+										defaultValue={corporateInformation?.companyInformation.name}
+										required
+									/>
+								)}
 
-                {user.type === "agent" && (
-                  <Input
-                    label="Arab name"
-                    type="text"
-                    name="arabName"
-                    onChange={(e) => setArabName(e)}
-                    placeholder="Enter your arab name"
-                    defaultValue={arabName}
-                    required
-                  />
-                )}
+								{user.type === "agent" && (
+									<Input
+										label="Arab name"
+										type="text"
+										name="arabName"
+										onChange={(e) => setArabName(e)}
+										placeholder="Enter your arab name"
+										defaultValue={arabName}
+										required
+									/>
+								)}
 
-                <Input
-                  label="E-mail Address"
-                  type="email"
-                  name="email"
-                  onChange={(e) => setEmail(e)}
-                  placeholder="Enter email address"
-                  defaultValue={email}
-                  required
-                />
-              </DoubleColumnRow>
-              <DoubleColumnRow>
-                <Input
-                  label="Current Password"
-                  type="password"
-                  name="password"
-                  onChange={(e) => setPassword(e)}
-                  placeholder="Enter your password"
-                  required
-                />
-                <Input
-                  label="New Password"
-                  type="password"
-                  name="newPassword"
-                  onChange={(e) => setNewPassword(e)}
-                  placeholder="Enter your new password (optional)"
-                />
-              </DoubleColumnRow>
-              {user.type === "agent" && (
-                <div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
-                  <Input
-                    label="Company Name"
-                    type="text"
-                    name="companyName"
-                    onChange={() => null}
-                    placeholder="Enter your company's name"
-                    defaultValue={companyName}
-                    disabled
-                  />
-                  <Input
-                    label="Commercial Registration"
-                    type="text"
-                    name="commercialRegistration"
-                    onChange={() => null}
-                    placeholder="Enter commercial registration"
-                    defaultValue={commercialRegistration}
-                    disabled
-                  />
-                </div>
-              )}
+								<Input
+									label="E-mail Address"
+									type="email"
+									name="email"
+									onChange={(e) => setEmail(e)}
+									placeholder="Enter email address"
+									defaultValue={email}
+									required
+								/>
+							</DoubleColumnRow>
+							<DoubleColumnRow>
+								<Input
+									label="Current Password"
+									type="password"
+									name="password"
+									onChange={(e) => setPassword(e)}
+									placeholder="Enter your password"
+									required
+								/>
+								<Input
+									label="New Password"
+									type="password"
+									name="newPassword"
+									onChange={(e) => setNewPassword(e)}
+									placeholder="Enter your new password (optional)"
+								/>
+							</DoubleColumnRow>
+							{user.type === "agent" && (
+								<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
+									<Input
+										label="Company Name"
+										type="text"
+										name="companyName"
+										onChange={() => null}
+										placeholder="Enter your company's name"
+										defaultValue={companyName}
+										disabled
+									/>
+									<Input
+										label="Commercial Registration"
+										type="text"
+										name="commercialRegistration"
+										onChange={() => null}
+										placeholder="Enter commercial registration"
+										defaultValue={commercialRegistration}
+										disabled
+									/>
+								</div>
+							)}
 
-              <DoubleColumnRow>
-                <div className="flex flex-col gap-3 w-full">
-                  <label className="font-normal text-base text-mti-gray-dim">
-                    Country *
-                  </label>
-                  <CountrySelect value={country} onChange={setCountry} />
-                </div>
-                <Input
-                  type="tel"
-                  name="phone"
-                  label="Phone number"
-                  onChange={(e) => setPhone(e)}
-                  placeholder="Enter phone number"
-                  defaultValue={phone}
-                  required
-                />
-              </DoubleColumnRow>
+							<DoubleColumnRow>
+								<div className="flex flex-col gap-3 w-full">
+									<label className="font-normal text-base text-mti-gray-dim">Country *</label>
+									<CountrySelect value={country} onChange={setCountry} />
+								</div>
+								<Input
+									type="tel"
+									name="phone"
+									label="Phone number"
+									onChange={(e) => setPhone(e)}
+									placeholder="Enter phone number"
+									defaultValue={phone}
+									required
+								/>
+							</DoubleColumnRow>
 
-              {user.type === "student" ? (
-                <DoubleColumnRow>
-                  <Input
-                    type="text"
-                    name="passport_id"
-                    label="Passport/National ID"
-                    onChange={(e) => setPassportID(e)}
-                    placeholder="Enter National ID or Passport number"
-                    value={passport_id}
-                    required
-                  />
-                  <TimezoneInput />
-                </DoubleColumnRow>
-              ) : (
-                <TimezoneInput />
-              )}
+							{user.type === "student" ? (
+								<DoubleColumnRow>
+									<Input
+										type="text"
+										name="passport_id"
+										label="Passport/National ID"
+										onChange={(e) => setPassportID(e)}
+										placeholder="Enter National ID or Passport number"
+										value={passport_id}
+										required
+									/>
+									<TimezoneInput />
+								</DoubleColumnRow>
+							) : (
+								<TimezoneInput />
+							)}
 
-              <Divider />
+							<Divider />
 
-              {desiredLevels &&
-                ["developer", "student"].includes(user.type) && (
-                  <div className="flex flex-col gap-3 w-full">
-                    <label className="font-normal text-base text-mti-gray-dim">
-                      Desired Levels
-                    </label>
-                    <ModuleLevelSelector
-                      levels={desiredLevels}
-                      setLevels={
-                        setDesiredLevels as Dispatch<
-                          SetStateAction<{ [key in Module]: number }>
-                        >
-                      }
-                    />
-                  </div>
-                )}
+							{desiredLevels && ["developer", "student"].includes(user.type) && (
+								<>
+									<div className="flex flex-col gap-3 w-full">
+										<label className="font-normal text-base text-mti-gray-dim">Desired Levels</label>
+										<ModuleLevelSelector
+											levels={desiredLevels}
+											setLevels={setDesiredLevels as Dispatch<SetStateAction<{[key in Module]: number}>>}
+										/>
+									</div>
+									<div className="flex flex-col gap-3 w-full">
+										<label className="font-normal text-base text-mti-gray-dim">Focus</label>
+										<div className="grid grid-cols-1 md:grid-cols-2 gap-y-4 gap-x-16 w-full">
+											<button
+												onClick={() => setFocus("academic")}
+												className={clsx(
+													"w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-center items-center gap-12 bg-white",
+													"hover:bg-mti-purple-light hover:text-white",
+													focus === "academic" && "!bg-mti-purple-light !text-white",
+													"transition duration-300 ease-in-out",
+												)}>
+												Academic
+											</button>
+											<button
+												onClick={() => setFocus("general")}
+												className={clsx(
+													"w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-center items-center gap-12 bg-white",
+													"hover:bg-mti-purple-light hover:text-white",
+													focus === "general" && "!bg-mti-purple-light !text-white",
+													"transition duration-300 ease-in-out",
+												)}>
+												General
+											</button>
+										</div>
+									</div>
+								</>
+							)}
 
-              {preferredGender &&
-                ["developer", "student"].includes(user.type) && (
-                  <>
-                    <Divider />
-                    <DoubleColumnRow>
-                      <div className="flex flex-col gap-3 w-full">
-                        <label className="font-normal text-base text-mti-gray-dim">
-                          Speaking Instructor&apos;s Gender
-                        </label>
-                        <Select
-                          value={{
-                            value: preferredGender,
-                            label: capitalize(preferredGender),
-                          }}
-                          onChange={(value) =>
-                            value
-                              ? setPreferredGender(
-                                  value.value as InstructorGender,
-                                )
-                              : null
-                          }
-                          options={[
-                            { value: "male", label: "Male" },
-                            { value: "female", label: "Female" },
-                            { value: "varied", label: "Varied" },
-                          ]}
-                        />
-                      </div>
-                      <div className="flex flex-col gap-4 w-full">
-                        <label className="font-normal text-base text-mti-gray-dim flex gap-2 items-center">
-                          Preferred Topics{" "}
-                          <span
-                            className="tooltip"
-                            data-tip="These topics will be considered for speaking and writing modules, aiming to include at least one exercise containing of the these in the selected exams."
-                          >
-                            <BsQuestionCircleFill />
-                          </span>
-                        </label>
-                        <Button
-                          className="w-full"
-                          variant="outline"
-                          onClick={() => setIsPreferredTopicsOpen(true)}
-                        >
-                          Select Topics ({preferredTopics?.length || "All"}{" "}
-                          selected)
-                        </Button>
-                      </div>
-                    </DoubleColumnRow>
+							{preferredGender && ["developer", "student"].includes(user.type) && (
+								<>
+									<Divider />
+									<DoubleColumnRow>
+										<div className="flex flex-col gap-3 w-full">
+											<label className="font-normal text-base text-mti-gray-dim">Speaking Instructor&apos;s Gender</label>
+											<Select
+												value={{
+													value: preferredGender,
+													label: capitalize(preferredGender),
+												}}
+												onChange={(value) => (value ? setPreferredGender(value.value as InstructorGender) : null)}
+												options={[
+													{value: "male", label: "Male"},
+													{value: "female", label: "Female"},
+													{value: "varied", label: "Varied"},
+												]}
+											/>
+										</div>
+										<div className="flex flex-col gap-4 w-full">
+											<label className="font-normal text-base text-mti-gray-dim flex gap-2 items-center">
+												Preferred Topics{" "}
+												<span
+													className="tooltip"
+													data-tip="These topics will be considered for speaking and writing modules, aiming to include at least one exercise containing of the these in the selected exams.">
+													<BsQuestionCircleFill />
+												</span>
+											</label>
+											<Button className="w-full" variant="outline" onClick={() => setIsPreferredTopicsOpen(true)}>
+												Select Topics ({preferredTopics?.length || "All"} selected)
+											</Button>
+										</div>
+									</DoubleColumnRow>
 
-                    <TopicModal
-                      key={v4()}
-                      isOpen={isPreferredTopicsOpen}
-                      onClose={() => setIsPreferredTopicsOpen(false)}
-                      selectTopics={setPreferredTopics}
-                      initialTopics={preferredTopics || []}
-                    />
+									<TopicModal
+										key={v4()}
+										isOpen={isPreferredTopicsOpen}
+										onClose={() => setIsPreferredTopicsOpen(false)}
+										selectTopics={setPreferredTopics}
+										initialTopics={preferredTopics || []}
+									/>
 
-                    <Divider />
-                  </>
-                )}
+									<Divider />
+								</>
+							)}
 
-              {user.type === "corporate" && (
-                <>
-                  <DoubleColumnRow>
-                    <Input
-                      type="number"
-                      name="companyUsers"
-                      onChange={() => null}
-                      label="Number of users"
-                      defaultValue={
-                        user.corporateInformation.companyInformation.userAmount
-                      }
-                      disabled
-                      required
-                    />
-                    <Input
-                      type="text"
-                      name="pricing"
-                      onChange={() => null}
-                      label="Pricing"
-                      defaultValue={`${user.corporateInformation.payment?.value} ${user.corporateInformation.payment?.currency}`}
-                      disabled
-                      required
-                    />
-                  </DoubleColumnRow>
-                  <ExpirationDate />
-                </>
-              )}
+							{user.type === "corporate" && (
+								<>
+									<DoubleColumnRow>
+										<Input
+											type="number"
+											name="companyUsers"
+											onChange={() => null}
+											label="Number of users"
+											defaultValue={user.corporateInformation.companyInformation.userAmount}
+											disabled
+											required
+										/>
+										<Input
+											type="text"
+											name="pricing"
+											onChange={() => null}
+											label="Pricing"
+											defaultValue={`${user.corporateInformation.payment?.value} ${user.corporateInformation.payment?.currency}`}
+											disabled
+											required
+										/>
+									</DoubleColumnRow>
+									<ExpirationDate />
+								</>
+							)}
 
-              {user.type === "corporate" && (
-                <>
-                  <Divider />
-                  <DoubleColumnRow>
-                    <Input
-                      label="Name"
-                      type="text"
-                      name="name"
-                      onChange={(e) => setName(e)}
-                      placeholder="Enter your name"
-                      defaultValue={name}
-                      required
-                    />
-                    <Input
-                      name="position"
-                      onChange={setPosition}
-                      defaultValue={position}
-                      type="text"
-                      label="Position"
-                      placeholder="CEO, Head of Marketing..."
-                      required
-                    />
-                  </DoubleColumnRow>
-                </>
-              )}
+							{user.type === "corporate" && (
+								<>
+									<Divider />
+									<DoubleColumnRow>
+										<Input
+											label="Name"
+											type="text"
+											name="name"
+											onChange={(e) => setName(e)}
+											placeholder="Enter your name"
+											defaultValue={name}
+											required
+										/>
+										<Input
+											name="position"
+											onChange={setPosition}
+											defaultValue={position}
+											type="text"
+											label="Position"
+											placeholder="CEO, Head of Marketing..."
+											required
+										/>
+									</DoubleColumnRow>
+								</>
+							)}
 
-              {user.type === "corporate" &&
-                user.corporateInformation.referralAgent && (
-                  <>
-                    <Divider />
-                    <DoubleColumnRow>
-                      <Input
-                        name="agentName"
-                        onChange={() => null}
-                        defaultValue={
-                          users.find(
-                            (x) =>
-                              x.id === user.corporateInformation.referralAgent,
-                          )?.name
-                        }
-                        type="text"
-                        label="Country Manager's Name"
-                        placeholder="Not available"
-                        required
-                        disabled
-                      />
-                      <Input
-                        name="agentEmail"
-                        onChange={() => null}
-                        defaultValue={
-                          users.find(
-                            (x) =>
-                              x.id === user.corporateInformation.referralAgent,
-                          )?.email
-                        }
-                        type="text"
-                        label="Country Manager's E-mail"
-                        placeholder="Not available"
-                        required
-                        disabled
-                      />
-                    </DoubleColumnRow>
-                    <DoubleColumnRow>
-                      <div className="flex flex-col gap-2 w-full">
-                        <label className="font-normal text-base text-mti-gray-dim">
-                          Country Manager&apos;s Country *
-                        </label>
-                        <CountrySelect
-                          value={
-                            users.find(
-                              (x) =>
-                                x.id ===
-                                user.corporateInformation.referralAgent,
-                            )?.demographicInformation?.country
-                          }
-                          onChange={() => null}
-                          disabled
-                        />
-                      </div>
+							{user.type === "corporate" && user.corporateInformation.referralAgent && (
+								<>
+									<Divider />
+									<DoubleColumnRow>
+										<Input
+											name="agentName"
+											onChange={() => null}
+											defaultValue={users.find((x) => x.id === user.corporateInformation.referralAgent)?.name}
+											type="text"
+											label="Country Manager's Name"
+											placeholder="Not available"
+											required
+											disabled
+										/>
+										<Input
+											name="agentEmail"
+											onChange={() => null}
+											defaultValue={users.find((x) => x.id === user.corporateInformation.referralAgent)?.email}
+											type="text"
+											label="Country Manager's E-mail"
+											placeholder="Not available"
+											required
+											disabled
+										/>
+									</DoubleColumnRow>
+									<DoubleColumnRow>
+										<div className="flex flex-col gap-2 w-full">
+											<label className="font-normal text-base text-mti-gray-dim">Country Manager&apos;s Country *</label>
+											<CountrySelect
+												value={
+													users.find((x) => x.id === user.corporateInformation.referralAgent)?.demographicInformation
+														?.country
+												}
+												onChange={() => null}
+												disabled
+											/>
+										</div>
 
-                      <Input
-                        type="tel"
-                        name="agentPhone"
-                        label="Country Manager's Phone"
-                        onChange={() => null}
-                        placeholder="Not available"
-                        defaultValue={
-                          users.find(
-                            (x) =>
-                              x.id === user.corporateInformation.referralAgent,
-                          )?.demographicInformation?.phone
-                        }
-                        disabled
-                        required
-                      />
-                    </DoubleColumnRow>
-                  </>
-                )}
+										<Input
+											type="tel"
+											name="agentPhone"
+											label="Country Manager's Phone"
+											onChange={() => null}
+											placeholder="Not available"
+											defaultValue={
+												users.find((x) => x.id === user.corporateInformation.referralAgent)?.demographicInformation?.phone
+											}
+											disabled
+											required
+										/>
+									</DoubleColumnRow>
+								</>
+							)}
 
-              {user.type !== "corporate" && (
-                <DoubleColumnRow>
-                  <EmploymentStatusInput
-                    value={employment}
-                    onChange={setEmployment}
-                  />
+							{user.type !== "corporate" && (
+								<DoubleColumnRow>
+									<EmploymentStatusInput value={employment} onChange={setEmployment} />
 
-                  <div className="flex flex-col gap-8 w-full">
-                    <GenderInput value={gender} onChange={setGender} />
-                    <ExpirationDate />
-                  </div>
-                </DoubleColumnRow>
-              )}
-            </form>
-          </div>
-          <div className="flex flex-col gap-6 w-48">
-            <div
-              className="flex flex-col gap-3 items-center h-fit cursor-pointer group"
-              onClick={() => (profilePictureInput.current as any)?.click()}
-            >
-              <div className="relative overflow-hidden h-48 w-48 rounded-full">
-                <div
-                  className={clsx(
-                    "absolute top-0 left-0 bg-mti-purple-light/60 w-full h-full z-20 flex items-center justify-center opacity-0 group-hover:opacity-100",
-                    "transition ease-in-out duration-300",
-                  )}
-                >
-                  <BsCamera className="text-6xl text-mti-purple-ultralight/80" />
-                </div>
-                <img
-                  src={profilePicture}
-                  alt={user.name}
-                  className="aspect-square drop-shadow-xl self-end object-cover"
-                />
-              </div>
-              <input
-                type="file"
-                className="hidden"
-                onChange={uploadProfilePicture}
-                accept="image/*"
-                ref={profilePictureInput}
-              />
-              <span
-                onClick={() => (profilePictureInput.current as any)?.click()}
-                className="cursor-pointer text-mti-purple-light text-sm"
-              >
-                Change picture
-              </span>
-              <h6 className="font-normal text-base text-mti-gray-taupe">
-                {USER_TYPE_LABELS[user.type]}
-              </h6>
-            </div>
-            {user.type === "agent" && (
-              <div className="flag items-center h-fit">
-                <img
-                  alt={
-                    user.demographicInformation?.country.toLowerCase() + "_flag"
-                  }
-                  src={`https://flagcdn.com/w320/${user.demographicInformation?.country.toLowerCase()}.png`}
-                  width="320"
-                />
-              </div>
-            )}
-            {manualDownloadLink && (
-              <a
-                href={manualDownloadLink}
-                className="max-w-[200px] self-end w-full"
-                download
-              >
-                <Button
-                  color="purple"
-                  variant="outline"
-                  className="max-w-[200px] self-end w-full"
-                >
-                  Download Manual
-                </Button>
-              </a>
-            )}
-          </div>
-        </div>
-        <div className="flex flex-col gap-4 mt-8 mb-20">
-          <span className="text-lg font-bold">Bio</span>
-          <textarea
-            className="w-full h-full min-h-[148px] cursor-text px-7 py-8 input border-2 border-mti-gray-platinum bg-white rounded-3xl"
-            onChange={(e) => setBio(e.target.value)}
-            defaultValue={bio}
-            placeholder="Write your text here..."
-          />
-        </div>
+									<div className="flex flex-col gap-8 w-full">
+										<GenderInput value={gender} onChange={setGender} />
+										<ExpirationDate />
+									</div>
+								</DoubleColumnRow>
+							)}
+						</form>
+					</div>
+					<div className="flex flex-col gap-6 w-48">
+						<div
+							className="flex flex-col gap-3 items-center h-fit cursor-pointer group"
+							onClick={() => (profilePictureInput.current as any)?.click()}>
+							<div className="relative overflow-hidden h-48 w-48 rounded-full">
+								<div
+									className={clsx(
+										"absolute top-0 left-0 bg-mti-purple-light/60 w-full h-full z-20 flex items-center justify-center opacity-0 group-hover:opacity-100",
+										"transition ease-in-out duration-300",
+									)}>
+									<BsCamera className="text-6xl text-mti-purple-ultralight/80" />
+								</div>
+								<img src={profilePicture} alt={user.name} className="aspect-square drop-shadow-xl self-end object-cover" />
+							</div>
+							<input type="file" className="hidden" onChange={uploadProfilePicture} accept="image/*" ref={profilePictureInput} />
+							<span
+								onClick={() => (profilePictureInput.current as any)?.click()}
+								className="cursor-pointer text-mti-purple-light text-sm">
+								Change picture
+							</span>
+							<h6 className="font-normal text-base text-mti-gray-taupe">{USER_TYPE_LABELS[user.type]}</h6>
+						</div>
+						{user.type === "agent" && (
+							<div className="flag items-center h-fit">
+								<img
+									alt={user.demographicInformation?.country.toLowerCase() + "_flag"}
+									src={`https://flagcdn.com/w320/${user.demographicInformation?.country.toLowerCase()}.png`}
+									width="320"
+								/>
+							</div>
+						)}
+						{manualDownloadLink && (
+							<a href={manualDownloadLink} className="max-w-[200px] self-end w-full" download>
+								<Button color="purple" variant="outline" className="max-w-[200px] self-end w-full">
+									Download Manual
+								</Button>
+							</a>
+						)}
+					</div>
+				</div>
+				<div className="flex flex-col gap-4 mt-8 mb-20">
+					<span className="text-lg font-bold">Bio</span>
+					<textarea
+						className="w-full h-full min-h-[148px] cursor-text px-7 py-8 input border-2 border-mti-gray-platinum bg-white rounded-3xl"
+						onChange={(e) => setBio(e.target.value)}
+						defaultValue={bio}
+						placeholder="Write your text here..."
+					/>
+				</div>
 
-        <div className="self-end flex justify-between w-full gap-8 absolute bottom-8 left-0 px-8">
-          <Link href="/" className="max-w-[200px] self-end w-full">
-            <Button
-              color="purple"
-              variant="outline"
-              className="max-w-[200px] self-end w-full"
-            >
-              Back
-            </Button>
-          </Link>
-          <Button
-            color="purple"
-            className="max-w-[200px] self-end w-full"
-            onClick={updateUser}
-            disabled={isLoading}
-          >
-            Save Changes
-          </Button>
-        </div>
-      </section>
-    </Layout>
-  );
+				<div className="self-end flex justify-between w-full gap-8 absolute bottom-8 left-0 px-8">
+					<Link href="/" className="max-w-[200px] self-end w-full">
+						<Button color="purple" variant="outline" className="max-w-[200px] self-end w-full">
+							Back
+						</Button>
+					</Link>
+					<Button color="purple" className="max-w-[200px] self-end w-full" onClick={updateUser} disabled={isLoading}>
+						Save Changes
+					</Button>
+				</div>
+			</section>
+		</Layout>
+	);
 }
 
 export default function Home() {
-  const { user, mutateUser } = useUser({ redirectTo: "/login" });
+	const {user, mutateUser} = useUser({redirectTo: "/login"});
 
-  return (
-    <>
-      <Head>
-        <title>Profile | EnCoach</title>
-        <meta
-          name="description"
-          content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
-        />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <link rel="icon" href="/favicon.ico" />
-      </Head>
-      <ToastContainer />
-      {user && <UserProfile user={user} mutateUser={mutateUser} />}
-    </>
-  );
+	return (
+		<>
+			<Head>
+				<title>Profile | EnCoach</title>
+				<meta
+					name="description"
+					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+				/>
+				<meta name="viewport" content="width=device-width, initial-scale=1" />
+				<link rel="icon" href="/favicon.ico" />
+			</Head>
+			<ToastContainer />
+			{user && <UserProfile user={user} mutateUser={mutateUser} />}
+		</>
+	);
 }
diff --git a/src/utils/evaluation.ts b/src/utils/evaluation.ts
index cbcc9fae..82283a4b 100644
--- a/src/utils/evaluation.ts
+++ b/src/utils/evaluation.ts
@@ -45,10 +45,11 @@ export const evaluateSpeakingAnswer = async (
 	exercise: SpeakingExercise | InteractiveSpeakingExercise,
 	solution: UserSolution,
 	id: string,
+	task: number,
 ): Promise<UserSolution | undefined> => {
 	switch (exercise?.type) {
 		case "speaking":
-			return {...(await evaluateSpeakingExercise(exercise, exercise.id, solution, id)), id} as UserSolution;
+			return {...(await evaluateSpeakingExercise(exercise, exercise.id, solution, id, task)), id} as UserSolution;
 		case "interactiveSpeaking":
 			return {...(await evaluateInteractiveSpeakingExercise(exercise.id, solution, id)), id} as UserSolution;
 		default:
@@ -66,6 +67,7 @@ const evaluateSpeakingExercise = async (
 	exerciseId: string,
 	solution: UserSolution,
 	id: string,
+	task: number,
 ): Promise<UserSolution | undefined> => {
 	const formData = new FormData();
 
@@ -81,6 +83,7 @@ const evaluateSpeakingExercise = async (
 		`${exercise.text.replaceAll("\n", "")}` + (exercise.prompts.length > 0 ? `You should talk about: ${exercise.prompts.join(", ")}` : "");
 	formData.append("question", evaluationQuestion);
 	formData.append("id", id);
+	formData.append("task", task.toString());
 
 	const config = {
 		headers: {
diff --git a/src/utils/propagate.user.changes.ts b/src/utils/propagate.user.changes.ts
index 48e896bf..c0346741 100644
--- a/src/utils/propagate.user.changes.ts
+++ b/src/utils/propagate.user.changes.ts
@@ -67,7 +67,7 @@ export const propagateStatusChange = (userId: string, status: UserStatus) =>
 			});
 	});
 
-export const propagateExpiryDateChanges = (userId: string, initialExpiryDate: Date | null, subscriptionExpirationDate: Date | null) =>
+export const propagateExpiryDateChanges = (userId: string, initialExpiryDate: Date | null | undefined, subscriptionExpirationDate: Date | null) =>
 	new Promise((resolve, reject) => {
 		getDoc(doc(db, "users", userId))
 			.then((docUser) => {
@@ -93,6 +93,7 @@ export const propagateExpiryDateChanges = (userId: string, initialExpiryDate: Da
 							.then(async (data) => {
 								const filtered = data.filter((x) => {
 									if (x === null) return false;
+									if (!x.subscriptionExpirationDate && !initialExpiryDate) return true;
 									if (x.subscriptionExpirationDate !== initialExpiryDate) return false;
 									return true;
 								}) as User[];