diff --git a/src/app/api/gemini.ts b/src/app/api/gemini.ts
index 610dd11..0515705 100644
--- a/src/app/api/gemini.ts
+++ b/src/app/api/gemini.ts
@@ -11,11 +11,6 @@ export async function run(
 
     const modelsAvailable = ['gemini-pro', 'gemini-pro-vision'];
 
-    function selectModel(message: object, modelsAvailable: Array<string>) {
-        const messageSize = Object.keys(message).length;
-        return messageSize === 1 ? modelsAvailable[0] : modelsAvailable[1];
-    }
-
     const isGenerationConfigPresent =
         generationConfig && Object.keys(generationConfig).length > 0;
 
@@ -42,3 +37,8 @@ export async function run(
 
     return text;
 }
+
+function selectModel(message: object, modelsAvailable: Array<string>) {
+    const messageSize = Object.keys(message).length;
+    return messageSize === 1 ? modelsAvailable[0] : modelsAvailable[1];
+}
diff --git a/src/components/home/body.tsx b/src/components/home/body.tsx
index f2e45c7..9377d52 100644
--- a/src/components/home/body.tsx
+++ b/src/components/home/body.tsx
@@ -34,25 +34,6 @@ export default function Body() {
     const [generationConfig, setGenerationConfig] = useState<object>({});
     const [apikey] = useLocalStorage<string>('apikey', '');
 
-    const {
-        handleSubmit,
-        control,
-
-        reset,
-        formState: { errors, isValid },
-    } = useForm<InputSchemaType>({
-        resolver: zodResolver(inputSchema),
-        mode: 'onChange',
-        defaultValues: {
-            text: '',
-        },
-    });
-
-    const handleButtonClick = () => {
-        const fileInput = document.getElementById('picture');
-        fileInput?.click();
-    };
-
     const settledState = (response: string) => {
         setResponse(response);
         setIsLoading(false);
@@ -65,6 +46,13 @@ export default function Body() {
         setIsError(true);
     };
 
+    const initialStateApi = async () => {
+        setIsError(false);
+        setErrorMessage('');
+        setResponse('');
+        setIsLoading(true);
+    };
+
     const makeTheCall = async (
         message: object,
         apikey: string,
@@ -80,15 +68,30 @@ export default function Body() {
             });
     };
 
-    const onSubmit: SubmitHandler<InputSchemaType> = (
+    const {
+        handleSubmit,
+        control,
+        reset,
+        formState: { errors, isValid },
+    } = useForm<InputSchemaType>({
+        resolver: zodResolver(inputSchema),
+        mode: 'onChange',
+        defaultValues: {
+            text: '',
+        },
+    });
+
+    //TODO : Hacky way to open file dialog
+    const handleImageButtonUpload = () => {
+        const fileInput = document.getElementById('picture');
+        fileInput?.click();
+    };
+
+    const onSubmit: SubmitHandler<InputSchemaType> = async (
         data: InputSchemaType,
     ) => {
-        setResponse('');
+        await initialStateApi();
         const { text: textValue } = data;
-        setIsLoading(true);
-        // getValues();
-
-        console.log('maxToken', maxToken);
 
         if (maxToken !== 0) {
             setGenerationConfig({
@@ -104,46 +107,46 @@ export default function Body() {
             if (imageParts.length > 0) {
                 message.imageParts = imageParts;
             }
-
-            void makeTheCall(message, apikey as string, generationConfig);
+            await makeTheCall(message, apikey as string, generationConfig);
         } catch (error) {
             console.error(error);
+        } finally {
+            reset();
         }
-
-        reset();
     };
 
-    const handleImages = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const handleImages = async (event: React.ChangeEvent<HTMLInputElement>) => {
         const files = event.target.files;
 
         if (files && files.length > 0) {
             toast.success(` ${files.length} Files selected`);
 
-            const generativePart: Array<object> = [];
-            for (let i = 0; i < files.length; i++) {
-                void fileToGenerativePart(files[i]).then((base64Image) => {
-                    generativePart.push(base64Image);
-                    setImageParts(generativePart);
-                });
+            try {
+                const generativePart: Array<object> = [];
+
+                const fileLength = files.length;
+
+                for (
+                    let fileNumber = 0;
+                    fileNumber < fileLength;
+                    fileNumber++
+                ) {
+                    await fileToGenerativePart(files[fileNumber]).then(
+                        (base64Image) => {
+                            generativePart.push(base64Image);
+                            setImageParts(generativePart);
+                        },
+                    );
+                }
+            } catch (error) {
+                console.error(error);
+                toast.error(error as string);
             }
         } else {
             toast.error('No files selected');
         }
     };
 
-    // TODO : Do we need this function since we are using useLocalStorage ?
-    // const getValues = () => {
-    //     if (localStorage !== undefined) {
-    //         if (localStorage.getItem('apikey')) {
-    //             setApikeys(localStorage.getItem('apikey') || '');
-    //         }
-
-    //         if (localStorage.getItem('token')) {
-    //             setMaxToken(parseInt(localStorage.getItem('token') || '0'));
-    //         }
-    //     }
-    // };
-
     // Generation Configuration
     useEffect(() => {
         if (maxToken > 0) {
@@ -206,7 +209,7 @@ export default function Body() {
                                 <Button
                                     className="h-10 w-10  rounded-full bg-blue-500  p-2"
                                     type="button"
-                                    onClick={handleButtonClick}
+                                    onClick={handleImageButtonUpload}
                                 >
                                     <ImagePhosphor size={25} weight="fill" />
                                     <Input