diff --git a/src/components/AppDrawer/AppDrawer.js b/src/components/AppDrawer/AppDrawer.js
index a612897..11cfc6f 100644
--- a/src/components/AppDrawer/AppDrawer.js
+++ b/src/components/AppDrawer/AppDrawer.js
@@ -72,57 +72,41 @@ function AppDrawer({ forceRerender, setForceRerender }) {
     }
   }, []);
 
-  React.useEffect(() => {
+  const handleLocalStorageValue = ()=>{
+    localStorage.setItem('apphomelang', value);
+    localStorage.setItem('validateLimit', validateLimit);
+    localStorage.setItem('discoveryLimit', discoveryLimit);
+    localStorage.setItem('contentPracticeLimit', contentPracticeLimit);
+    localStorage.setItem('contentTargetLimit', contentTargetLimit);
+    localStorage.setItem('isAudioPreprocessing', isAudioPreprocessingEnabled ? true : false);
     localStorage.setItem('discoveryStatus', isDiscoveryEnabled ? 'enabled' : 'disabled');
-  }, [isDiscoveryEnabled]); 
+    localStorage.setItem('userCurrentLevel', level)
+    localStorage.setItem('validationSession', validationSession);
+    localStorage.setItem('practiceSession', practiceSession);
+    fetchDataFromApi(value);
+  }
 
-  React.useEffect(() => {
-    localStorage.setItem('isAudioPreprocessing', isAudioPreprocessingEnabled ? true : false);
-  }, [isAudioPreprocessingEnabled]); 
+  const handleModalCloseWithoutSave = ()=>{
+    setValue(localStorage.getItem('apphomelang'))
+    setValidateLimit(localStorage.getItem('validateLimit'))
+    setDiscoveryLimit(localStorage.getItem('discoveryLimit'));
+    setContentPracticeLimit(localStorage.getItem('contentPracticeLimit'));
+    setContentTargetLimit(localStorage.getItem('contentTargetLimit'));
+    setAudioPreprocessingStatus(localStorage.getItem('isAudioPreprocessing') === 'true'?true:false);
+    setDiscoveryStatus(localStorage.getItem('discoveryStatus') === 'enabled'? true : false);
+    setLevel(localStorage.getItem('userCurrentLevel'));
+    setPracticeSession(localStorage.getItem('practiceSession'))
+    setValidationSession(localStorage.getItem('validationSession'));
+    fetchDataFromApi(value);
+  }
 
   React.useEffect(() => {
     if (value) {
-      localStorage.setItem('apphomelang', value);
       handleGetLesson();
+      fetchDataFromApi(value);
     }
   }, [value]);
 
-  React.useEffect(() => {
-    if (validateLimit) {
-      localStorage.setItem('validateLimit', validateLimit);
-    }
-  }, [validateLimit]);
-
-  React.useEffect(() => {
-    if (discoveryLimit) {
-      localStorage.setItem('discoveryLimit', discoveryLimit);
-    }
-  }, [discoveryLimit]);
-
-  React.useEffect(() => {
-    if (contentPracticeLimit) {
-      localStorage.setItem('contentPracticeLimit', contentPracticeLimit);
-    }
-  }, [contentPracticeLimit]);
-
-  React.useEffect(() => {
-    if (contentTargetLimit) {
-      localStorage.setItem('contentTargetLimit', contentTargetLimit);
-    }
-  }, [contentTargetLimit]);
-
-  React.useEffect(() => {
-    if (validationSession) {
-      localStorage.setItem('validationSession', validationSession);
-    }
-  }, [validationSession]);
-
-  React.useEffect(() => {
-    if (practiceSession) {
-      localStorage.setItem('practiceSession', practiceSession);
-    }
-  }, [practiceSession]);
-
   React.useEffect(() => {
     fetchApi();
   }, []);
@@ -130,7 +114,7 @@ function AppDrawer({ forceRerender, setForceRerender }) {
   const fetchApi = async () => {
     try {
       const response = await fetch(
-        `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/getMilestone/user/${localStorage.getItem('virtualID')}?language=${localStorage.getItem('apphomelang')}`
+        `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/getMilestone/user/${localStorage.getItem('virtualID')}?language=${value}`
       )
         .then(res => {
           return res.json();
@@ -158,10 +142,9 @@ function AppDrawer({ forceRerender, setForceRerender }) {
     }
   };
 
-    const fetchDataFromApi = async () => {
+    const fetchDataFromApi = async (lang) => {
         try {
-          const result = await fetchPointerApi();
-  
+          const result = await fetchPointerApi(lang);
           if (result && result.result) {
             localStorage.setItem(
               'totalSessionPoints',
@@ -204,7 +187,7 @@ function AppDrawer({ forceRerender, setForceRerender }) {
             process.env.REACT_APP_LEARNER_AI_APP_HOST
           }/lp-tracker/api/lesson/getLessonProgressByUserId/${localStorage.getItem(
             'virtualID'
-          )}?language=${localStorage.getItem('apphomelang')}`
+          )}?language=${value}`
         )
           .then(res => {
             return res.json();
@@ -228,8 +211,8 @@ function AppDrawer({ forceRerender, setForceRerender }) {
   const handleSave = () => {
     onClose();
     handleNavigate();
-    setForceRerender(!forceRerender); 
-    fetchDataFromApi();
+    setForceRerender(!forceRerender);
+    handleLocalStorageValue()
   };
   return (
     <>
@@ -249,7 +232,10 @@ function AppDrawer({ forceRerender, setForceRerender }) {
       <Drawer
         isOpen={isOpen}
         placement="right"
-        onClose={onClose}
+        onClose={() => {
+          onClose();
+          handleModalCloseWithoutSave();
+        }}
         size={'md'}
         finalFocusRef={btnRef}
       >
@@ -328,24 +314,26 @@ function AppDrawer({ forceRerender, setForceRerender }) {
                   />
                 </HStack>
                 <RadioGroup onChange={setDiscoveryLimit} value={discoveryLimit}>
-                <HStack spacing='4'>
+                  <HStack spacing="4">
                     <span>Limit:</span>
-                      <Radio value='5'>5</Radio>
-                    <Radio value='10'>10</Radio>
-                    <Radio value='15'>15</Radio>
+                    <Radio value="5">5</Radio>
+                    <Radio value="10">10</Radio>
+                    <Radio value="15">15</Radio>
                   </HStack>
                 </RadioGroup>
               </FormControl>
               <Divider />
               <FormControl>
-              <FormLabel><Text as={'b'} >Validation </Text></FormLabel>
+                <FormLabel>
+                  <Text as={'b'}>Validation </Text>
+                </FormLabel>
                 <RadioGroup onChange={setValidateLimit} value={validateLimit}>
-                <HStack spacing='4'>
+                  <HStack spacing="4">
                     <span>Limit:</span>
-                    <Radio value='5'>5</Radio>
-                    <Radio value='10'>10</Radio>
-                    <Radio value='15'>15</Radio>
-                    <Radio value='0'>ALL</Radio>
+                    <Radio value="5">5</Radio>
+                    <Radio value="10">10</Radio>
+                    <Radio value="15">15</Radio>
+                    <Radio value="0">ALL</Radio>
                   </HStack>
                 </RadioGroup>
               </FormControl>
@@ -353,50 +341,74 @@ function AppDrawer({ forceRerender, setForceRerender }) {
                 <HStack>
                   <div>Session ID:</div>
                   <div>
-                  <Select placeholder='Select option' value={validationSession} onChange={(event) => setValidationSession(event.target.value)}>
-                      {PreviousUserSessions?.map((session, ind) =>
-                        <option key={ind} value={session}>{session}</option>
-                      )}
+                    <Select
+                      placeholder="Select option"
+                      value={validationSession}
+                      onChange={event =>
+                        setValidationSession(event.target.value)
+                      }
+                    >
+                      {PreviousUserSessions?.map((session, ind) => (
+                        <option key={ind} value={session}>
+                          {session}
+                        </option>
+                      ))}
                     </Select>
                   </div>
                 </HStack>
               </FormControl>
               <Divider />
               <FormControl>
-              <FormLabel><Text as={'b'} > Practice </Text></FormLabel>
-                <RadioGroup onChange={setContentPracticeLimit} value={contentPracticeLimit}>
-                  <HStack spacing='4'>
+                <FormLabel>
+                  <Text as={'b'}> Practice </Text>
+                </FormLabel>
+                <RadioGroup
+                  onChange={setContentPracticeLimit}
+                  value={contentPracticeLimit}
+                >
+                  <HStack spacing="4">
                     <span>Content Limit:</span>
-                    <Radio value='5'>5</Radio>
-                    <Radio value='10'>10</Radio>
-                    <Radio value='15'>15</Radio>
+                    <Radio value="5">5</Radio>
+                    <Radio value="10">10</Radio>
+                    <Radio value="15">15</Radio>
                   </HStack>
                 </RadioGroup>
               </FormControl>
 
               <FormControl>
-              <RadioGroup onChange={setContentTargetLimit} value={contentTargetLimit}>
-                  <HStack spacing='4'>
+                <RadioGroup
+                  onChange={setContentTargetLimit}
+                  value={contentTargetLimit}
+                >
+                  <HStack spacing="4">
                     <span>Target Limit:</span>
-                    <Radio value='5'>5</Radio>
-                    <Radio value='10'>10</Radio>
-                    <Radio value='15'>15</Radio>
+                    <Radio value="5">5</Radio>
+                    <Radio value="10">10</Radio>
+                    <Radio value="15">15</Radio>
                   </HStack>
                 </RadioGroup>
               </FormControl>
               <HStack>
                 <div>Session ID:</div>
-                <div><Select placeholder='Select option' value={practiceSession} onChange={(event) => setPracticeSession(event.target.value)}>
-                  {PreviousUserSessions?.map((session, ind) =>
-                    <option key={ind} value={session}>{session}</option>
-                  )}
-                </Select></div>
+                <div>
+                  <Select
+                    placeholder="Select option"
+                    value={practiceSession}
+                    onChange={event => setPracticeSession(event.target.value)}
+                  >
+                    {PreviousUserSessions?.map((session, ind) => (
+                      <option key={ind} value={session}>
+                        {session}
+                      </option>
+                    ))}
+                  </Select>
+                </div>
               </HStack>
               <Accordion allowMultiple>
                 <AccordionItem>
                   <h2>
                     <AccordionButton>
-                    <Box as="span" flex='1' textAlign='left'>
+                      <Box as="span" flex="1" textAlign="left">
                         <Text as={'b'}>Practice Config </Text>
                       </Box>
                       <AccordionIcon />
@@ -406,13 +418,19 @@ function AppDrawer({ forceRerender, setForceRerender }) {
                     <ConfigForm />
                   </AccordionPanel>
                 </AccordionItem>
-
               </Accordion>
             </Stack>
           </DrawerBody>
 
           <DrawerFooter borderTopWidth="1px">
-            <Button variant="outline" mr={3} onClick={onClose}>
+            <Button
+              variant="outline"
+              mr={3}
+              onClick={() => {
+                onClose();
+                handleModalCloseWithoutSave();
+              }}
+            >
               Cancel
             </Button>
             <Button onClick={() => handleSave()} colorScheme="blue">
@@ -422,7 +440,7 @@ function AppDrawer({ forceRerender, setForceRerender }) {
         </DrawerContent>
       </Drawer>
     </>
-  )
+  );
 }
 
 export default AppDrawer;
\ No newline at end of file
diff --git a/src/components/AppTimer/AppTimer.jsx b/src/components/AppTimer/AppTimer.jsx
index ac4face..95df45b 100644
--- a/src/components/AppTimer/AppTimer.jsx
+++ b/src/components/AppTimer/AppTimer.jsx
@@ -64,7 +64,7 @@ const AppTimer = ({ isLoggedIn, setIsLoggedIn }) => {
   useEffect(() => {
     const fetchDataFromApi = async () => {
       try {
-        const result = await fetchPointerApi();
+        const result = await fetchPointerApi(localStorage.getItem('apphomelang'));
 
         if (result && result.result) {
           localStorage.setItem(
diff --git a/src/utils/api/PointerApi.js b/src/utils/api/PointerApi.js
index 24e0ee1..40d2a1b 100644
--- a/src/utils/api/PointerApi.js
+++ b/src/utils/api/PointerApi.js
@@ -1,9 +1,8 @@
 
 const baseURL = `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lp-tracker/api/pointer`;
 
-export const fetchPointerApi = () => {
-    const url = `${baseURL}/getPointers/${localStorage.getItem('virtualID')}/${localStorage.getItem('virtualStorySessionID')}?language=${localStorage.getItem('apphomelang')}`;
-  
+export const fetchPointerApi = (lang) => {
+    const url = `${baseURL}/getPointers/${localStorage.getItem('virtualID')}/${localStorage.getItem('virtualStorySessionID')}?language=${lang}`;
     return fetch(url)
       .then((res) => {
         if (!res.ok) {
@@ -12,6 +11,18 @@ export const fetchPointerApi = () => {
         return res.json();
       })
       .then((data) => {
+        localStorage.setItem(
+          'totalSessionPoints',
+          data.result.totalSessionPoints
+        );
+        localStorage.setItem(
+          'totalUserPoints',
+          data.result.totalUserPoints
+        );
+        localStorage.setItem(
+          'totalLanguagePoints',
+          data.result.totalLanguagePoints
+        );
         return data;
       })
       .catch((error) => {