diff --git a/src/common/TrackingComponent.tsx b/src/common/TrackingComponent.tsx
index 832f71dd..8b72a6b9 100644
--- a/src/common/TrackingComponent.tsx
+++ b/src/common/TrackingComponent.tsx
@@ -199,10 +199,16 @@ const TrackingComponent: React.FC<ITrackingComponent> = ({ children }) => {
   const handleUpdateActivity = async () => {
     //ft==>app opened in foreground
     //bt==>app is minimized or closed
+
     const foregroundTimestamp = await getItem(StorageKeys.APP_FOREGROUND_TIMESTAMP);
     const backgroundTimestamp = await getItem(StorageKeys.APP_BACKGROUND_TIMESTAMP);
     const stateSetTimestamp = await getItem(StorageKeys.STATE_SET_TIMESTAMP);
 
+    if (foregroundTimestamp == null) {
+      console.log('fts set after installation');
+      await setItem(StorageKeys.APP_FOREGROUND_TIMESTAMP, dayJs().toString());
+    }
+
     const foregroundTime = dayJs(foregroundTimestamp);
     const backgroundTime = dayJs(backgroundTimestamp);
     const stateSetTime = dayJs(stateSetTimestamp);
@@ -222,21 +228,20 @@ const TrackingComponent: React.FC<ITrackingComponent> = ({ children }) => {
     const ACTIVITY_TIME_WINDOW_HIGH = getActivityTimeWindowHigh();
     const ACTIVITY_TIME_WINDOW_MEDIUM = getActivityTimeWindowMedium();
 
-    const isStateSetTimeMoreThanHighRangeAndLessThanMediumRange =
-      diffBetweenCurrentTimeAndSetStateTime >= ACTIVITY_TIME_WINDOW_HIGH;
-    const isStateSetTimeMoreThanMediumRange =
-      diffBetweenCurrentTimeAndSetStateTime >=
-      ACTIVITY_TIME_WINDOW_MEDIUM - ACTIVITY_TIME_WINDOW_HIGH;
+    const isStateSetTimeWithinHighRange =
+      diffBetweenCurrentTimeAndSetStateTime < ACTIVITY_TIME_WINDOW_HIGH;
+    const isStateSetTimeWithinMediumRange =
+      diffBetweenCurrentTimeAndSetStateTime < ACTIVITY_TIME_WINDOW_MEDIUM;
     const isForegroundTimeAfterBackground = dayJs(foregroundTimestamp).isAfter(backgroundTimestamp);
 
     if (AppState.currentState === AppStates.ACTIVE) {
-      if (foregroundTimestamp == null) {
-        console.log('fts set after installation');
-        await setItem(StorageKeys.APP_FOREGROUND_TIMESTAMP, dayJs().toString());
-      }
       if (diffBetweenCurrentTimeAndForegroundTime >= ACTIVITY_TIME_ON_APP) {
         console.log('App State Active HIGH');
         await setItem(StorageKeys.USER_ACTIVITY_ON_APP, AgentActivity.HIGH);
+        //await setItem(StorageKeys.STATE_SET_TIMESTAMP, dayJs().toString());
+        console.log(
+          'High State Set Time for Active User' + (await getItem(StorageKeys.STATE_SET_TIMESTAMP))
+        );
         return;
       }
       return;
@@ -252,8 +257,8 @@ const TrackingComponent: React.FC<ITrackingComponent> = ({ children }) => {
     console.log(diffBetweenBackgroundAndForegroundTime);
     console.log(diffBetweenCurrentTimeAndForegroundTime);
     console.log(diffBetweenCurrentTimeAndBackgroundTime);
-    console.log(isStateSetTimeMoreThanHighRangeAndLessThanMediumRange);
-    console.log(isStateSetTimeMoreThanMediumRange);
+    console.log(isStateSetTimeWithinHighRange);
+    console.log(isStateSetTimeWithinMediumRange);
     console.log(isForegroundTimeAfterBackground);
     console.log(ACTIVITY_TIME_ON_APP);
     console.log(ACTIVITY_TIME_WINDOW_HIGH);
@@ -264,30 +269,31 @@ const TrackingComponent: React.FC<ITrackingComponent> = ({ children }) => {
         await setItem(StorageKeys.USER_ACTIVITY_ON_APP, AgentActivity.HIGH);
         await setItem(StorageKeys.STATE_SET_TIMESTAMP, dayJs().toString());
         console.log('isForegroundTimeAfterBackground HIGH');
-        console.log('High State Set Time' + (await getItem(StorageKeys.STATE_SET_TIMESTAMP)));
+        console.log(
+          'High State Set Time on Foreground>Background' +
+            (await getItem(StorageKeys.STATE_SET_TIMESTAMP))
+        );
         return;
       }
       return;
-    } else if (
-      isStateSetTimeMoreThanHighRangeAndLessThanMediumRange &&
-      (await getItem(StorageKeys.USER_ACTIVITY_ON_APP)) == AgentActivity.HIGH
-    ) {
+    } else if (isStateSetTimeWithinHighRange) {
+      console.log('isStateSetTimeWithinHighRange HIGH and state is not set right now');
+      return;
+    } else if (isStateSetTimeWithinMediumRange) {
       await setItem(StorageKeys.USER_ACTIVITY_ON_APP, AgentActivity.MEDIUM);
-      await setItem(StorageKeys.STATE_SET_TIMESTAMP, stateSetTime.add(2, 'minutes').toString());
+      //await setItem(StorageKeys.STATE_SET_TIMESTAMP, stateSetTime.add(2, 'minutes').toString());
       console.log('isStateSetTimeWithInMediumRange MEDIUM');
       console.log('Medium State Set Time' + (await getItem(StorageKeys.STATE_SET_TIMESTAMP)));
       return;
-    } else if (
-      isStateSetTimeMoreThanMediumRange &&
-      (await getItem(StorageKeys.USER_ACTIVITY_ON_APP)) == AgentActivity.MEDIUM
-    ) {
+    } else {
       await setItem(StorageKeys.USER_ACTIVITY_ON_APP, AgentActivity.LOW);
-      await setItem(StorageKeys.STATE_SET_TIMESTAMP, stateSetTime.add(2, 'minutes').toString());
+      //await setItem(StorageKeys.STATE_SET_TIMESTAMP, stateSetTime.add(4, 'minutes').toString());
       console.log('isStateSetTimeWithInLowRange LOW');
       console.log('Low State Set Time' + (await getItem(StorageKeys.STATE_SET_TIMESTAMP)));
-    } else {
       return;
     }
+
+    console.log('Never here');
   };
 
   const deleteCache = () => {