diff --git a/.gradle/8.7/executionHistory/executionHistory.bin b/.gradle/8.7/executionHistory/executionHistory.bin
index c8b98a8..b236251 100644
Binary files a/.gradle/8.7/executionHistory/executionHistory.bin and b/.gradle/8.7/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.7/executionHistory/executionHistory.lock b/.gradle/8.7/executionHistory/executionHistory.lock
index a06e8c1..d953817 100644
Binary files a/.gradle/8.7/executionHistory/executionHistory.lock and b/.gradle/8.7/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.7/fileHashes/fileHashes.bin b/.gradle/8.7/fileHashes/fileHashes.bin
index 7ec4c8d..ed31ead 100644
Binary files a/.gradle/8.7/fileHashes/fileHashes.bin and b/.gradle/8.7/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.7/fileHashes/fileHashes.lock b/.gradle/8.7/fileHashes/fileHashes.lock
index f6d0509..669c4e5 100644
Binary files a/.gradle/8.7/fileHashes/fileHashes.lock and b/.gradle/8.7/fileHashes/fileHashes.lock differ
diff --git a/.gradle/8.7/fileHashes/resourceHashesCache.bin b/.gradle/8.7/fileHashes/resourceHashesCache.bin
index 4bbcc3e..f1f5c49 100644
Binary files a/.gradle/8.7/fileHashes/resourceHashesCache.bin and b/.gradle/8.7/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index fa3f199..f327360 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk
index 0cca610..ae38fab 100644
Binary files a/app/build/intermediates/apk/debug/app-debug.apk and b/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex
index c69b685..591d168 100644
Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex differ
diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/2/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/2/classes.dex
index c2d3b55..e738f27 100644
Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/2/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/2/classes.dex differ
diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/6/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/6/classes.dex
index 3765929..4225a16 100644
Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/6/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/6/classes.dex differ
diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/7/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/7/classes.dex
index bdb6c8d..d85b475 100644
Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/7/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/7/classes.dex differ
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 94d2fb0..bc6c2fe 100644
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Thu May 14 20:41:24 EET 2026
+#Thu May 14 20:47:58 EET 2026
 base.0=/Users/hamzaaleghwairyeen/development/App/jordan_bot/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
 base.1=/Users/hamzaaleghwairyeen/development/App/jordan_bot/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
 base.2=/Users/hamzaaleghwairyeen/development/App/jordan_bot/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiClient$service$2.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiClient$service$2.dex
index 909f278..43da0fc 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiClient$service$2.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiClient$service$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiClient.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiClient.dex
index 592be3b..3a1366f 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiClient.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiClient.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiResponse.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiResponse.dex
index 29c0d59..09d20c6 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiResponse.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/ApiResponse.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/BulkLocationRequest.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/BulkLocationRequest.dex
index b33b360..c25d3da 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/BulkLocationRequest.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/BulkLocationRequest.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/LocationPoint.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/LocationPoint.dex
index 034bd79..c79f8e5 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/LocationPoint.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/LocationPoint.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/RideLogRequest.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/RideLogRequest.dex
index 445fc7f..c995151 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/RideLogRequest.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/api/RideLogRequest.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/model/RideRequest.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/model/RideRequest.dex
index 3961c69..55369dc 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/model/RideRequest.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/model/RideRequest.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/CareemParser.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/CareemParser.dex
index b36ed36..edbc03f 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/CareemParser.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/CareemParser.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/JeenyParser.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/JeenyParser.dex
index 37eee68..db3e323 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/JeenyParser.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/JeenyParser.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/PetraRideParser.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/PetraRideParser.dex
index 81292ae..8dc1498 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/PetraRideParser.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/PetraRideParser.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/TaxiFParser.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/TaxiFParser.dex
index f640ecc..8651c28 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/TaxiFParser.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/TaxiFParser.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/UberParser.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/UberParser.dex
index 6cb1f85..df2c037 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/UberParser.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/parser/UberParser.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/service/RideNotificationListener$sendLogToBackend$1.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/service/RideNotificationListener$sendLogToBackend$1.dex
index fe42e51..07ff696 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/service/RideNotificationListener$sendLogToBackend$1.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/service/RideNotificationListener$sendLogToBackend$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/service/RideNotificationListener.dex b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/service/RideNotificationListener.dex
index 69c6f23..2252b83 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/service/RideNotificationListener.dex and b/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/jordanbot/autoride/service/RideNotificationListener.dex differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab
index 67f486e..e0ee063 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at
index cbe4997..c4733a5 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab
index 609cd2e..4382045 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
index ea00ff6..28e8fd1 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
index aa6d2ce..e790207 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
index 12fae93..a4bb4cd 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab
index 857a75f..9790628 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
index 0c57874..3dffeea 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab
index e12b2d0..f8c3d07 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values
new file mode 100644
index 0000000..136146c
Binary files /dev/null and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at
index d500473..20573ca 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.s b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.s
new file mode 100644
index 0000000..4cbc39c
--- /dev/null
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.s
@@ -0,0 +1 @@
+�h
\ No newline at end of file
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab
index 2ea8cff..a83774a 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
index 1ead97c..30c221f 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab
index 200b190..9f6b04f 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at
index ddf3daf..cd4ca74 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab
index a258af5..057c443 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at
index e85706d..f1a1665 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab
index 4eb9e7b..109082b 100644
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-30
+40
 0
\ No newline at end of file
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab
index a052244..62e109b 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at
index ac19456..acdf22c 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab
index 52d8cc3..9f3ee21 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream
index a40e358..80f53f5 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len
index 19f7832..dfa34aa 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len
index 575d132..73e7fcf 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at
index bfc9edc..b76bb95 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i
index 474fdca..d75c219 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab
index 2f60bad..c13f80e 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream
index 09bd5f8..047e967 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len
index 4914418..7aa5944 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len
index 9f1bd74..2fcd496 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values
index 1e287b7..b8a1cec 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at
index 79af247..c1c4404 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s
index d4879d9..321686f 100644
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s
@@ -1 +1 @@
-��
χ
��
˺
Ҝ
�

\ No newline at end of file
+��
χ
��
˺
Ҝ
�
��

\ No newline at end of file
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i
index 425db6e..dd8b09b 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i differ
diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin b/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin
index ed0ad5e..6bd8d50 100644
Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin and b/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin differ
diff --git a/app/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin b/app/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin
index 7442650..81b925f 100644
Binary files a/app/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin and b/app/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin differ
diff --git a/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin b/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin
index 4e5f39f..a6e0f60 100644
Binary files a/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin and b/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiClient$service$2.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiClient$service$2.class
index c6a1103..df1becc 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiClient$service$2.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiClient$service$2.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiClient.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiClient.class
index 244a83a..884feaf 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiClient.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiClient.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiResponse.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiResponse.class
index 1ed0e84..947fe18 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiResponse.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/ApiResponse.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/BulkLocationRequest.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/BulkLocationRequest.class
index 652b2d4..4898c7b 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/BulkLocationRequest.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/BulkLocationRequest.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/LocationPoint.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/LocationPoint.class
index 0cf4809..66b4c35 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/LocationPoint.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/LocationPoint.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/RideLogRequest.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/RideLogRequest.class
index 6be8788..33997ed 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/RideLogRequest.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/api/RideLogRequest.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/model/RideRequest.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/model/RideRequest.class
index 414c5e9..79ee82a 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/model/RideRequest.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/model/RideRequest.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/CareemParser.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/CareemParser.class
index 2a11ecf..af0c64a 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/CareemParser.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/CareemParser.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/JeenyParser.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/JeenyParser.class
index f8800da..df471dd 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/JeenyParser.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/JeenyParser.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/PetraRideParser.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/PetraRideParser.class
index 13ef7ff..1fcf900 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/PetraRideParser.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/PetraRideParser.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/TaxiFParser.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/TaxiFParser.class
index 9493053..dffce45 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/TaxiFParser.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/TaxiFParser.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/UberParser.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/UberParser.class
index c77228b..b925296 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/UberParser.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/parser/UberParser.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/service/RideNotificationListener$sendLogToBackend$1.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/service/RideNotificationListener$sendLogToBackend$1.class
index 6f07d42..f5dab7a 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/service/RideNotificationListener$sendLogToBackend$1.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/service/RideNotificationListener$sendLogToBackend$1.class differ
diff --git a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/service/RideNotificationListener.class b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/service/RideNotificationListener.class
index 96a426b..d2a6afa 100644
Binary files a/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/service/RideNotificationListener.class and b/app/build/tmp/kotlin-classes/debug/com/jordanbot/autoride/service/RideNotificationListener.class differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 65fc8a2..f1a1023 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,8 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".SubscriptionActivity" android:exported="false" />
+
         <service
             android:name=".service.RideNotificationListener"
             android:label="@string/app_name"
diff --git a/app/src/main/java/com/jordanbot/autoride/MainActivity.kt b/app/src/main/java/com/jordanbot/autoride/MainActivity.kt
index cc3d532..0d15c4c 100644
--- a/app/src/main/java/com/jordanbot/autoride/MainActivity.kt
+++ b/app/src/main/java/com/jordanbot/autoride/MainActivity.kt
@@ -21,6 +21,10 @@ import androidx.core.content.ContextCompat
 import com.jordanbot.autoride.service.BotForegroundService
 import com.jordanbot.autoride.service.OverlayService
 
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import com.jordanbot.autoride.subscription.SubscriptionManager
+
 class MainActivity : AppCompatActivity() {
 
     private lateinit var tvStatus: TextView
@@ -31,10 +35,22 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        // Load cached subscription data
+        SubscriptionManager.loadLocalCache(this)
+
+        // Check subscription with server
+        lifecycleScope.launch {
+            SubscriptionManager.checkSubscription(this@MainActivity)
+        }
+
         tvStatus = findViewById(R.id.tv_status)
         btnStart = findViewById(R.id.btn_start)
         btnStop = findViewById(R.id.btn_stop)
 
+        findViewById<Button>(R.id.btn_subscriptions).setOnClickListener {
+            startActivity(Intent(this, SubscriptionActivity::class.java))
+        }
+
         findViewById<Button>(R.id.btn_notification).setOnClickListener {
             startActivity(Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS))
         }
diff --git a/app/src/main/java/com/jordanbot/autoride/SubscriptionActivity.kt b/app/src/main/java/com/jordanbot/autoride/SubscriptionActivity.kt
new file mode 100644
index 0000000..bd60a05
--- /dev/null
+++ b/app/src/main/java/com/jordanbot/autoride/SubscriptionActivity.kt
@@ -0,0 +1,78 @@
+package com.jordanbot.autoride
+
+import android.os.Bundle
+import android.widget.Button
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import com.jordanbot.autoride.api.ActivateSubscriptionRequest
+import com.jordanbot.autoride.api.ApiClient
+import com.jordanbot.autoride.subscription.SubscriptionManager
+import com.jordanbot.autoride.utils.DeviceUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class SubscriptionActivity : AppCompatActivity() {
+
+    private lateinit var tvStatus: TextView
+    private lateinit var btnBasic: Button
+    private lateinit var btnPro: Button
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_subscription)
+
+        tvStatus = findViewById(R.id.tv_current_status)
+        btnBasic = findViewById(R.id.btn_subscribe_basic)
+        btnPro = findViewById(R.id.btn_subscribe_pro)
+
+        updateStatusUI()
+
+        btnBasic.setOnClickListener { activatePlan("basic") }
+        btnPro.setOnClickListener { activatePlan("pro") }
+    }
+
+    private fun updateStatusUI() {
+        val plan = SubscriptionManager.currentPlan
+        val limit = SubscriptionManager.ridesLimit
+        val today = SubscriptionManager.ridesToday
+        
+        val planText = when(plan) {
+            "basic" -> "أساسي ($limit طلب / يوم)"
+            "pro" -> "احترافي (لا محدود)"
+            "annual" -> "سنوي (لا محدود)"
+            else -> "مجاني (1 طلب / يوم)"
+        }
+        
+        tvStatus.text = "الخطة الحالية: $planText\nاستهلاك اليوم: $today"
+    }
+
+    private fun activatePlan(plan: String) {
+        // In a real app, integrate payment gateway here.
+        // For demonstration, we just call the API directly.
+        val fingerprint = DeviceUtils.getDeviceFingerprint(this)
+        
+        lifecycleScope.launch {
+            try {
+                val response = withContext(Dispatchers.IO) {
+                    ApiClient.service.activateSubscription(
+                        ActivateSubscriptionRequest(fingerprint, plan, "DEMO_REF_123")
+                    )
+                }
+                
+                if (response.success) {
+                    Toast.makeText(this@SubscriptionActivity, "تم تفعيل الاشتراك بنجاح!", Toast.LENGTH_SHORT).show()
+                    // Re-check subscription to update local cache
+                    SubscriptionManager.checkSubscription(this@SubscriptionActivity)
+                    updateStatusUI()
+                } else {
+                    Toast.makeText(this@SubscriptionActivity, "فشل تفعيل الاشتراك: ${response.message}", Toast.LENGTH_SHORT).show()
+                }
+            } catch (e: Exception) {
+                Toast.makeText(this@SubscriptionActivity, "حدث خطأ في الاتصال", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/jordanbot/autoride/api/BackendApi.kt b/app/src/main/java/com/jordanbot/autoride/api/BackendApi.kt
index f2c67c5..761b9f5 100644
--- a/app/src/main/java/com/jordanbot/autoride/api/BackendApi.kt
+++ b/app/src/main/java/com/jordanbot/autoride/api/BackendApi.kt
@@ -38,12 +38,41 @@ data class ApiResponse(
     val message: String
 )
 
+data class CheckSubscriptionRequest(val fingerprint: String)
+data class CheckSubscriptionResponse(
+    val success: Boolean,
+    val plan: String?,
+    val expires_at: String?,
+    val rides_today: Int?,
+    val rides_limit: Int?,
+    val can_accept: Boolean?
+)
+
+data class ActivateSubscriptionRequest(
+    val fingerprint: String,
+    val plan: String,
+    val payment_ref: String?
+)
+
+data class ActivateSubscriptionResponse(
+    val success: Boolean,
+    val message: String?,
+    val plan: String?,
+    val expires_at: String?
+)
+
 interface BackendApiService {
     @POST("api/rides.php")
     suspend fun logRide(@Body request: RideLogRequest): ApiResponse
 
     @POST("api/location.php")
     suspend fun updateBulkLocation(@Body request: BulkLocationRequest): ApiResponse
+
+    @POST("api/subscription/check.php")
+    suspend fun checkSubscription(@Body request: CheckSubscriptionRequest): CheckSubscriptionResponse
+    
+    @POST("api/subscription/activate.php")
+    suspend fun activateSubscription(@Body request: ActivateSubscriptionRequest): ActivateSubscriptionResponse
 }
 
 object ApiClient {
diff --git a/app/src/main/java/com/jordanbot/autoride/engine/RideDataMerger.kt b/app/src/main/java/com/jordanbot/autoride/engine/RideDataMerger.kt
new file mode 100644
index 0000000..de47d10
--- /dev/null
+++ b/app/src/main/java/com/jordanbot/autoride/engine/RideDataMerger.kt
@@ -0,0 +1,67 @@
+package com.jordanbot.autoride.engine
+
+import android.util.Log
+import com.jordanbot.autoride.model.RideRequest
+import kotlinx.coroutines.*
+
+object RideDataMerger {
+    private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
+    private var lastRequest: RideRequest? = null
+    private var lastTimestamp: Long = 0
+    private const val MERGE_WINDOW_MS = 5000L
+
+    var onRideReady: ((RideRequest) -> Unit)? = null
+
+    @Synchronized
+    fun updateFromNotification(request: RideRequest) {
+        Log.d("JordanBot", "🔔 Merger received Notification data: ${request.priceJod} JOD")
+        merge(request)
+    }
+
+    @Synchronized
+    fun updateFromScreen(request: RideRequest) {
+        Log.d("JordanBot", "👁️ Merger received Screen data: ${request.priceJod} JOD")
+        merge(request)
+    }
+
+    private fun merge(newPart: RideRequest) {
+        val now = System.currentTimeMillis()
+        val current = lastRequest
+
+        if (current == null || (now - lastTimestamp) > MERGE_WINDOW_MS || current.appPackage != newPart.appPackage) {
+            // New request sequence
+            lastRequest = newPart
+            lastTimestamp = now
+            
+            // Wait a bit to see if more data comes from the other source before emitting
+            scope.launch {
+                delay(1500) // Wait 1.5s for the other source
+                emitIfReady()
+            }
+        } else {
+            // Merge into current
+            lastRequest = current.copy(
+                priceJod = newPart.priceJod ?: current.priceJod,
+                minutesAway = newPart.minutesAway ?: current.minutesAway,
+                distanceKm = newPart.distanceKm ?: current.distanceKm,
+                pickupAddress = newPart.pickupAddress ?: current.pickupAddress,
+                dropoffAddress = newPart.dropoffAddress ?: current.dropoffAddress,
+                title = if (newPart.title.isNotEmpty() && newPart.title != "Screen Scrape") newPart.title else current.title,
+                text = if (newPart.text.isNotEmpty() && newPart.text != current.text) "${current.text} | ${newPart.text}" else current.text
+            )
+            lastTimestamp = now
+            emitIfReady()
+        }
+    }
+
+    private fun emitIfReady() {
+        val ride = lastRequest ?: return
+        
+        // Criteria for "Ready": We have at least a price
+        if (ride.priceJod != null) {
+            Log.d("JordanBot", "🔀 MERGED RIDE READY: $ride")
+            onRideReady?.invoke(ride)
+            lastRequest = null // Clear to avoid double emission
+        }
+    }
+}
diff --git a/app/src/main/java/com/jordanbot/autoride/service/BotForegroundService.kt b/app/src/main/java/com/jordanbot/autoride/service/BotForegroundService.kt
index e2a9b45..6290cab 100644
--- a/app/src/main/java/com/jordanbot/autoride/service/BotForegroundService.kt
+++ b/app/src/main/java/com/jordanbot/autoride/service/BotForegroundService.kt
@@ -5,6 +5,7 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.Service
 import android.content.Intent
+import android.location.Location
 import android.os.Build
 import android.os.IBinder
 import android.os.Looper
@@ -24,13 +25,26 @@ class BotForegroundService : Service() {
     private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private lateinit var fusedLocationClient: FusedLocationProviderClient
     private val locationBuffer = mutableListOf<LocationPoint>()
-    
-    private val UPLOAD_INTERVAL_MS = TimeUnit.SECONDS.toMillis(30)
-    private val TRACK_INTERVAL_MS = TimeUnit.SECONDS.toMillis(3)
+
+    // Battery-optimized intervals
+    private val UPLOAD_INTERVAL_MS = TimeUnit.MINUTES.toMillis(5)    // Upload every 5 minutes
+    private val TRACK_INTERVAL_MS = TimeUnit.SECONDS.toMillis(15)    // GPS poll every 15 seconds
+    private val MIN_DISPLACEMENT_METERS = 15f                         // Ignore movement < 15m
+
+    // Displacement filter: track last known location
+    private var lastTrackedLocation: Location? = null
 
     private val locationCallback = object : LocationCallback() {
         override fun onLocationResult(locationResult: LocationResult) {
             locationResult.lastLocation?.let { location ->
+                // Displacement filter: skip if driver hasn't moved 15 meters
+                val last = lastTrackedLocation
+                if (last != null && last.distanceTo(location) < MIN_DISPLACEMENT_METERS) {
+                    return // Driver is stationary, save battery
+                }
+
+                lastTrackedLocation = location
+
                 val point = LocationPoint(
                     latitude = location.latitude,
                     longitude = location.longitude,
@@ -58,7 +72,7 @@ class BotForegroundService : Service() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         val notification = NotificationCompat.Builder(this, CHANNEL_ID)
             .setContentTitle("Jordan Bot يعمل حالياً")
-            .setContentText("نحن نراقب الإشعارات ونحدث الخرائط.")
+            .setContentText("نبحث عن طلبات قريبة منك...")
             .setSmallIcon(R.drawable.bg_bubble)
             .setPriority(NotificationCompat.PRIORITY_LOW)
             .build()
@@ -69,7 +83,10 @@ class BotForegroundService : Service() {
 
     @SuppressLint("MissingPermission")
     private fun startTracking() {
-        val locationRequest = LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, TRACK_INTERVAL_MS)
+        val locationRequest = LocationRequest.Builder(
+            Priority.PRIORITY_BALANCED_POWER_ACCURACY, TRACK_INTERVAL_MS
+        )
+            .setMinUpdateDistanceMeters(MIN_DISPLACEMENT_METERS)
             .setMinUpdateIntervalMillis(TRACK_INTERVAL_MS)
             .build()
 
diff --git a/app/src/main/java/com/jordanbot/autoride/service/RideAccessibilityService.kt b/app/src/main/java/com/jordanbot/autoride/service/RideAccessibilityService.kt
index 1265543..dec1300 100644
--- a/app/src/main/java/com/jordanbot/autoride/service/RideAccessibilityService.kt
+++ b/app/src/main/java/com/jordanbot/autoride/service/RideAccessibilityService.kt
@@ -2,70 +2,143 @@ package com.jordanbot.autoride.service
 
 import android.accessibilityservice.AccessibilityService
 import android.accessibilityservice.AccessibilityServiceInfo
+import android.accessibilityservice.GestureDescription
+import android.graphics.Path
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.view.accessibility.AccessibilityEvent
 import android.view.accessibility.AccessibilityNodeInfo
+import com.jordanbot.autoride.engine.RideDataMerger
+import com.jordanbot.autoride.filter.FilterEngine
+import com.jordanbot.autoride.model.RideRequest
 
 class RideAccessibilityService : AccessibilityService() {
 
     private val handler = Handler(Looper.getMainLooper())
+    private val filterEngine = FilterEngine()
 
     override fun onAccessibilityEvent(event: AccessibilityEvent) {
-        if (event.eventType != AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED &&
-            event.eventType != AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED) return
+        val rootNode = rootInActiveWindow ?: return
+        val packageName = event.packageName?.toString() ?: ""
 
-        val source = event.source ?: return
-        val packageName = event.packageName?.toString() ?: return
+        // Only process supported apps
+        if (!isSupportedApp(packageName)) return
 
-        // Check if this package was recently flagged by NotificationListener to be accepted
-        if (RideNotificationListener.pendingAcceptPackage == packageName) {
-            val timeSinceRequest = System.currentTimeMillis() - RideNotificationListener.lastRequestTime
+        if (event.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED || 
+            event.eventType == AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED) {
             
-            // Only accept if within 15 seconds of notification
-            if (timeSinceRequest < 15000) {
-                findAndClickAcceptButton(source)
-            } else {
-                RideNotificationListener.pendingAcceptPackage = null // Expired
+            val screenData = scrapeScreen(rootNode, packageName)
+            if (screenData != null) {
+                RideDataMerger.updateFromScreen(screenData)
             }
         }
     }
 
-    private fun findAndClickAcceptButton(rootNode: AccessibilityNodeInfo) {
-        // Arabic and English accept terms
-        val acceptTerms = listOf("Accept", "قبول", "Tap to accept", "اضغط للقبول")
+    private fun isSupportedApp(pkg: String): Boolean {
+        return pkg == "com.ubercab.driver" || pkg == "com.careem.adma" || pkg == "me.jeeny.driver"
+    }
 
+    private fun scrapeScreen(root: AccessibilityNodeInfo, pkg: String): RideRequest? {
+        val allText = mutableListOf<String>()
+        collectAllText(root, allText)
+        val combinedText = allText.joinToString(" ")
+
+        // Extract price
+        val priceRegex = """(\d+\.?\d*)\s*(JOD|د\.أ|دينار)""".toRegex()
+        val priceMatch = priceRegex.find(combinedText)
+        val price = priceMatch?.groupValues?.get(1)?.toDoubleOrNull()
+
+        if (price != null) {
+            Log.d("JordanBot", "👁️ Scraped price from screen: $price $pkg")
+            
+            return RideRequest(
+                appPackage = pkg,
+                priceJod = price,
+                minutesAway = null,
+                distanceKm = null,
+                title = "Screen Scrape",
+                text = combinedText
+            )
+        }
+        return null
+    }
+
+    private fun collectAllText(node: AccessibilityNodeInfo?, list: MutableList<String>) {
+        if (node == null) return
+        node.text?.let { list.add(it.toString()) }
+        for (i in 0 until node.childCount) {
+            collectAllText(node.getChild(i), list)
+        }
+    }
+
+    private fun findAndAccept(root: AccessibilityNodeInfo, pkg: String) {
+        val acceptTerms = listOf("Accept", "قبول", "Tap to accept", "Confirm", "تأكيد")
+        
         for (term in acceptTerms) {
-            val nodes = rootNode.findAccessibilityNodeInfosByText(term)
+            val nodes = root.findAccessibilityNodeInfosByText(term)
             for (node in nodes) {
-                if (node.isClickable) {
-                    // Simulating human delay (e.g., 500ms)
-                    handler.postDelayed({
-                        node.performAction(AccessibilityNodeInfo.ACTION_CLICK)
-                        Log.d("JordanBot", "Clicked Accept on node: ${node.text}")
-                        // Reset pending accept after clicking
-                        RideNotificationListener.pendingAcceptPackage = null
-                    }, 500)
+                if (node.isClickable || node.parent?.isClickable == true) {
+                    val target = if (node.isClickable) node else node.parent
+                    Log.d("JordanBot", "🤖 Auto-Accepting via Click: $term")
+                    target.performAction(AccessibilityNodeInfo.ACTION_CLICK)
                     return
                 }
             }
         }
+
+        if (pkg == "com.ubercab.driver") {
+            performUberSwipe()
+        }
     }
 
-    override fun onInterrupt() {
-        Log.e("JordanBot", "Accessibility Service Interrupted")
+    private fun performUberSwipe() {
+        Log.d("JordanBot", "🤖 Attempting Uber Swipe...")
+        val displayMetrics = resources.displayMetrics
+        val width = displayMetrics.widthPixels
+        val height = displayMetrics.heightPixels
+
+        val path = Path()
+        path.moveTo(width * 0.2f, height * 0.85f)
+        path.lineTo(width * 0.8f, height * 0.85f)
+
+        val gesture = GestureDescription.Builder()
+            .addStroke(GestureDescription.StrokeDescription(path, 0, 500))
+            .build()
+
+        dispatchGesture(gesture, null, null)
     }
 
+    override fun onInterrupt() {}
+
     override fun onServiceConnected() {
         super.onServiceConnected()
-        Log.d("JordanBot", "Accessibility Service Connected")
         
+        RideDataMerger.onRideReady = { mergedRide ->
+            val passesFilters = filterEngine.evaluate(mergedRide)
+            val canAccept = SubscriptionManager.canAcceptRides
+            
+            Log.d("JordanBot", "🏁 Merger callback: PassesFilters=$passesFilters, CanAcceptQuota=$canAccept for ${mergedRide.appPackage}")
+            
+            if (passesFilters) {
+                if (canAccept) {
+                    val rootNode = rootInActiveWindow
+                    if (rootNode != null) {
+                        findAndAccept(rootNode, mergedRide.appPackage)
+                    } else {
+                        Log.e("JordanBot", "Cannot accept: rootInActiveWindow is null")
+                    }
+                } else {
+                    Log.w("JordanBot", "⚠️ Ride matches filters but DAILY LIMIT REACHED. Upgrade required.")
+                }
+            }
+        }
+
         val info = AccessibilityServiceInfo().apply {
             eventTypes = AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED or AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED
             feedbackType = AccessibilityServiceInfo.FEEDBACK_GENERIC
             notificationTimeout = 100
-            flags = AccessibilityServiceInfo.FLAG_REPORT_VIEW_IDS or AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS
+            flags = AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS or AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS
         }
         this.serviceInfo = info
     }
diff --git a/app/src/main/java/com/jordanbot/autoride/service/RideNotificationListener.kt b/app/src/main/java/com/jordanbot/autoride/service/RideNotificationListener.kt
index 7cd1a9b..fc8e506 100644
--- a/app/src/main/java/com/jordanbot/autoride/service/RideNotificationListener.kt
+++ b/app/src/main/java/com/jordanbot/autoride/service/RideNotificationListener.kt
@@ -70,23 +70,11 @@ class RideNotificationListener : NotificationListenerService() {
         Log.d("JordanBot", "Notification Content: $title | $text")
 
         val rideRequest = parser.parse(title, text)
-        if (rideRequest == null) {
-            Log.d("JordanBot", "Parser failed to extract ride info from: $title | $text")
-        }
-        
         if (rideRequest != null) {
-            val isAccepted = filterEngine.evaluate(rideRequest)
-            
-            // Send to Backend for Data Mining
-            sendLogToBackend(rideRequest, isAccepted, "$title - $text")
-
-            if (isAccepted) {
-                Log.d("JordanBot", "Ride ACCEPTED by filter: $rideRequest")
-                pendingAcceptPackage = packageName
-                lastRequestTime = System.currentTimeMillis()
-            } else {
-                Log.d("JordanBot", "Ride REJECTED by filter: $rideRequest")
-            }
+            // Forward to Merger instead of processing here
+            RideDataMerger.updateFromNotification(rideRequest)
+        } else {
+            Log.d("JordanBot", "Parser failed to extract ride info from: $title | $text")
         }
     }
 
diff --git a/app/src/main/java/com/jordanbot/autoride/subscription/SubscriptionManager.kt b/app/src/main/java/com/jordanbot/autoride/subscription/SubscriptionManager.kt
new file mode 100644
index 0000000..d1b79ba
--- /dev/null
+++ b/app/src/main/java/com/jordanbot/autoride/subscription/SubscriptionManager.kt
@@ -0,0 +1,61 @@
+package com.jordanbot.autoride.subscription
+
+import android.content.Context
+import android.util.Log
+import com.jordanbot.autoride.api.ApiClient
+import com.jordanbot.autoride.api.CheckSubscriptionRequest
+import com.jordanbot.autoride.utils.DeviceUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+object SubscriptionManager {
+    private const val PREFS_NAME = "SubscriptionPrefs"
+    private const val KEY_PLAN = "plan"
+    private const val KEY_CAN_ACCEPT = "can_accept"
+    private const val KEY_RIDES_TODAY = "rides_today"
+    private const val KEY_RIDES_LIMIT = "rides_limit"
+
+    var currentPlan: String = "free"
+    var canAcceptRides: Boolean = true
+    var ridesToday: Int = 0
+    var ridesLimit: Int = 1
+
+    fun loadLocalCache(context: Context) {
+        val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+        currentPlan = prefs.getString(KEY_PLAN, "free") ?: "free"
+        canAcceptRides = prefs.getBoolean(KEY_CAN_ACCEPT, true)
+        ridesToday = prefs.getInt(KEY_RIDES_TODAY, 0)
+        ridesLimit = prefs.getInt(KEY_RIDES_LIMIT, 1)
+    }
+
+    suspend fun checkSubscription(context: Context): Boolean {
+        return withContext(Dispatchers.IO) {
+            try {
+                val fingerprint = DeviceUtils.getDeviceFingerprint(context)
+                val response = ApiClient.service.checkSubscription(CheckSubscriptionRequest(fingerprint))
+                
+                if (response.success) {
+                    currentPlan = response.plan ?: "free"
+                    canAcceptRides = response.can_accept ?: false
+                    ridesToday = response.rides_today ?: 0
+                    ridesLimit = response.rides_limit ?: 1
+
+                    // Save to cache
+                    val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+                    prefs.edit().apply {
+                        putString(KEY_PLAN, currentPlan)
+                        putBoolean(KEY_CAN_ACCEPT, canAcceptRides)
+                        putInt(KEY_RIDES_TODAY, ridesToday)
+                        putInt(KEY_RIDES_LIMIT, ridesLimit)
+                        apply()
+                    }
+                    Log.d("JordanBot", "Subscription checked: $currentPlan, canAccept: $canAcceptRides")
+                    return@withContext true
+                }
+            } catch (e: Exception) {
+                Log.e("JordanBot", "Failed to check subscription", e)
+            }
+            return@withContext false
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5d42c5d..333768f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -179,7 +179,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="④ تحديث الخرائط (GPS)"
+                android:text="④ الموافقة على الطلبات القريبة"
                 android:textColor="#FFFFFF"
                 android:textSize="16sp"
                 android:textStyle="bold" />
@@ -188,7 +188,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:text="مطلوب لتتبع مسارك وتحديث خريطة الأردن وحفظ إحصائياتك"
+                android:text="مطلوب لمطابقة الطلبات القريبة من موقعك وتسريع القبول التلقائي"
                 android:textColor="#999999"
                 android:textSize="12sp" />
 
@@ -198,11 +198,21 @@
                 android:layout_height="44dp"
                 android:layout_marginTop="8dp"
                 android:background="@drawable/bg_button"
-                android:text="تفعيل تتبع الموقع"
+                android:text="تفعيل مطابقة الطلبات القريبة"
                 android:textColor="#FFFFFF"
                 android:textSize="14sp" />
         </LinearLayout>
 
+        <!-- Navigation Buttons -->
+        <Button
+            android:id="@+id/btn_subscriptions"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:backgroundTint="#2A2A4A"
+            android:text="💳 إدارة الاشتراكات"
+            android:textColor="#FFFFFF"
+            android:layout_marginBottom="24dp" />
+
         <!-- Launch Button -->
         <Button
             android:id="@+id/btn_start"
diff --git a/app/src/main/res/layout/activity_subscription.xml b/app/src/main/res/layout/activity_subscription.xml
new file mode 100644
index 0000000..c5aabff
--- /dev/null
+++ b/app/src/main/res/layout/activity_subscription.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#1A1A2E"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:padding="24dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="💳 الاشتراكات"
+            android:textColor="#00D4AA"
+            android:textSize="32sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp"
+            android:text="اختر الخطة المناسبة لعملك"
+            android:textColor="#AAAAAA"
+            android:textSize="16sp" />
+            
+        <TextView
+            android:id="@+id/tv_current_status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:text="الخطة الحالية: مجاني (1 طلب / يوم)"
+            android:textAlignment="center"
+            android:textColor="#FFFFFF"
+            android:textSize="16sp" />
+
+        <!-- Free Plan -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_card"
+            android:orientation="vertical"
+            android:padding="16dp"
+            android:layout_marginBottom="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="المجانية"
+                android:textColor="#FFFFFF"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="0 JOD"
+                android:textColor="#00D4AA"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+                
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="• طلب واحد يومياً\n• تجربة الأساسيات"
+                android:textColor="#AAAAAA"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <!-- Basic Plan -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_card"
+            android:orientation="vertical"
+            android:padding="16dp"
+            android:layout_marginBottom="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="الأساسية"
+                android:textColor="#FFFFFF"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1 JOD / شهر"
+                android:textColor="#00D4AA"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+                
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="• 10 طلبات يومياً\n• إحصائيات أساسية\n• فلاتر متقدمة"
+                android:textColor="#AAAAAA"
+                android:textSize="14sp" />
+                
+            <Button
+                android:id="@+id/btn_subscribe_basic"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:backgroundTint="#00D4AA"
+                android:textColor="#FFFFFF"
+                android:text="اشترك الآن" />
+        </LinearLayout>
+
+        <!-- Pro Plan -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_card"
+            android:orientation="vertical"
+            android:padding="16dp"
+            android:layout_marginBottom="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="الاحترافية"
+                android:textColor="#FFFFFF"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="2.5 JOD / شهر"
+                android:textColor="#00D4AA"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+                
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="• طلبات غير محدودة\n• أولوية القبول\n• دعم فني مخصص"
+                android:textColor="#AAAAAA"
+                android:textSize="14sp" />
+                
+            <Button
+                android:id="@+id/btn_subscribe_pro"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:backgroundTint="#FF9800"
+                android:textColor="#FFFFFF"
+                android:text="اشترك الآن" />
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/backend/api/rides.php b/backend/api/rides.php
index 0bda65b..b4147b7 100644
--- a/backend/api/rides.php
+++ b/backend/api/rides.php
@@ -55,6 +55,51 @@ $latitude = $input['latitude'] ?? null;
 $longitude = $input['longitude'] ?? null;
 
 try {
+    // --- Subscription Quota Check ---
+    if ($isAccepted === 1) {
+        $today = date('Y-m-d');
+        
+        // Get active subscription
+        $stmt = $pdo->prepare("SELECT plan, expires_at FROM subscriptions WHERE fingerprint = :fingerprint AND is_active = 1 ORDER BY id DESC LIMIT 1");
+        $stmt->execute([':fingerprint' => $fingerprint]);
+        $sub = $stmt->fetch(PDO::FETCH_ASSOC);
+        
+        $plan = 'free';
+        if ($sub) {
+            $plan = $sub['plan'];
+            if ($sub['expires_at'] && strtotime($sub['expires_at']) < time()) {
+                $plan = 'free'; // Expired
+            }
+        }
+
+        // Get daily usage
+        $stmt = $pdo->prepare("SELECT rides_accepted FROM daily_usage WHERE fingerprint = :fingerprint AND usage_date = :today");
+        $stmt->execute([':fingerprint' => $fingerprint, ':today' => $today]);
+        $usage = $stmt->fetch(PDO::FETCH_ASSOC);
+        $ridesToday = $usage ? (int)$usage['rides_accepted'] : 0;
+
+        // Determine limit
+        $limit = 1; // free
+        if ($plan === 'basic') $limit = 10;
+        if ($plan === 'pro' || $plan === 'annual') $limit = -1;
+
+        if ($limit !== -1 && $ridesToday >= $limit) {
+            http_response_code(403);
+            echo json_encode([
+                'success' => false, 
+                'message' => 'Daily limit reached',
+                'plan' => $plan,
+                'upgrade_required' => true
+            ]);
+            exit;
+        }
+        
+        // Update daily usage
+        $stmt = $pdo->prepare("INSERT INTO daily_usage (fingerprint, usage_date, rides_accepted) VALUES (:fingerprint, :today, 1) ON DUPLICATE KEY UPDATE rides_accepted = rides_accepted + 1");
+        $stmt->execute([':fingerprint' => $fingerprint, ':today' => $today]);
+    }
+    // --------------------------------
+
     $sql = "INSERT INTO rides (fingerprint, platform, price, pickup_distance, dropoff_distance, time_to_pickup, pickup_address, dropoff_address, is_accepted, raw_text, latitude, longitude, created_at) 
             VALUES (:fingerprint, :platform, :price, :pickup_distance, :dropoff_distance, :time_to_pickup, :pickup_address, :dropoff_address, :is_accepted, :raw_text, :latitude, :longitude, NOW())";
     
diff --git a/backend/api/subscription/activate.php b/backend/api/subscription/activate.php
new file mode 100644
index 0000000..c4c5551
--- /dev/null
+++ b/backend/api/subscription/activate.php
@@ -0,0 +1,70 @@
+<?php
+require_once __DIR__ . '/../../config/db.php';
+
+header('Content-Type: application/json');
+
+if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+    http_response_code(405);
+    echo json_encode(['success' => false, 'message' => 'Method Not Allowed']);
+    exit;
+}
+
+$input = json_decode(file_get_contents('php://input'), true);
+$fingerprint = $input['fingerprint'] ?? null;
+$plan = $input['plan'] ?? null;
+$paymentRef = $input['payment_ref'] ?? null;
+
+if (!$fingerprint || !$plan) {
+    http_response_code(400);
+    echo json_encode(['success' => false, 'message' => 'Missing fingerprint or plan']);
+    exit;
+}
+
+$validPlans = ['free', 'basic', 'pro', 'annual'];
+if (!in_array($plan, $validPlans)) {
+    http_response_code(400);
+    echo json_encode(['success' => false, 'message' => 'Invalid plan type']);
+    exit;
+}
+
+// Calculate expiration date based on plan
+$expiresAt = null;
+if ($plan === 'basic' || $plan === 'pro') {
+    $expiresAt = date('Y-m-d H:i:s', strtotime('+30 days'));
+} elseif ($plan === 'annual') {
+    $expiresAt = date('Y-m-d H:i:s', strtotime('+365 days'));
+}
+
+try {
+    $pdo->beginTransaction();
+
+    // Deactivate previous active subscriptions for this device
+    $stmt = $pdo->prepare("UPDATE subscriptions SET is_active = 0 WHERE fingerprint = :fingerprint");
+    $stmt->execute([':fingerprint' => $fingerprint]);
+
+    // Insert new subscription
+    $stmt = $pdo->prepare("INSERT INTO subscriptions (fingerprint, plan, expires_at, payment_ref, is_active) 
+                           VALUES (:fingerprint, :plan, :expires_at, :payment_ref, 1)");
+    $stmt->execute([
+        ':fingerprint' => $fingerprint,
+        ':plan' => $plan,
+        ':expires_at' => $expiresAt,
+        ':payment_ref' => $paymentRef
+    ]);
+
+    $pdo->commit();
+
+    echo json_encode([
+        'success' => true,
+        'message' => 'Subscription activated successfully',
+        'plan' => $plan,
+        'expires_at' => $expiresAt
+    ]);
+
+} catch (PDOException $e) {
+    if ($pdo->inTransaction()) {
+        $pdo->rollBack();
+    }
+    http_response_code(500);
+    echo json_encode(['success' => false, 'message' => 'Database error: ' . $e->getMessage()]);
+}
diff --git a/backend/api/subscription/check.php b/backend/api/subscription/check.php
new file mode 100644
index 0000000..20382cd
--- /dev/null
+++ b/backend/api/subscription/check.php
@@ -0,0 +1,68 @@
+<?php
+require_once __DIR__ . '/../../config/db.php';
+
+header('Content-Type: application/json');
+
+if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+    http_response_code(405);
+    echo json_encode(['success' => false, 'message' => 'Method Not Allowed']);
+    exit;
+}
+
+$input = json_decode(file_get_contents('php://input'), true);
+$fingerprint = $input['fingerprint'] ?? null;
+
+if (!$fingerprint) {
+    http_response_code(400);
+    echo json_encode(['success' => false, 'message' => 'Missing fingerprint']);
+    exit;
+}
+
+try {
+    // 1. Get Subscription Status
+    $stmt = $pdo->prepare("SELECT * FROM subscriptions WHERE fingerprint = :fingerprint AND is_active = 1 ORDER BY id DESC LIMIT 1");
+    $stmt->execute([':fingerprint' => $fingerprint]);
+    $sub = $stmt->fetch(PDO::FETCH_ASSOC);
+
+    $plan = $sub ? $sub['plan'] : 'free';
+    $expiresAt = $sub ? $sub['expires_at'] : null;
+
+    // Check expiration
+    if ($expiresAt && strtotime($expiresAt) < time()) {
+        // Expired, revert to free
+        $stmt = $pdo->prepare("UPDATE subscriptions SET is_active = 0 WHERE id = :id");
+        $stmt->execute([':id' => $sub['id']]);
+        $plan = 'free';
+        $expiresAt = null;
+    }
+
+    // 2. Get Daily Usage
+    $today = date('Y-m-d');
+    $stmt = $pdo->prepare("SELECT rides_accepted FROM daily_usage WHERE fingerprint = :fingerprint AND usage_date = :today");
+    $stmt->execute([
+        ':fingerprint' => $fingerprint,
+        ':today' => $today
+    ]);
+    $usage = $stmt->fetch(PDO::FETCH_ASSOC);
+    $ridesToday = $usage ? (int)$usage['rides_accepted'] : 0;
+
+    // 3. Determine limits
+    $limit = 1; // Default for free
+    if ($plan === 'basic') $limit = 10;
+    if ($plan === 'pro' || $plan === 'annual') $limit = -1; // Unlimited
+
+    $canAccept = ($limit === -1) || ($ridesToday < $limit);
+
+    echo json_encode([
+        'success' => true,
+        'plan' => $plan,
+        'expires_at' => $expiresAt,
+        'rides_today' => $ridesToday,
+        'rides_limit' => $limit,
+        'can_accept' => $canAccept
+    ]);
+
+} catch (PDOException $e) {
+    http_response_code(500);
+    echo json_encode(['success' => false, 'message' => 'Database error: ' . $e->getMessage()]);
+}
diff --git a/backend/schema.sql b/backend/schema.sql
index 0819329..278cf20 100644
--- a/backend/schema.sql
+++ b/backend/schema.sql
@@ -23,6 +23,29 @@ CREATE TABLE IF NOT EXISTS rides (
     INDEX (platform)
 ) ENGINE=InnoDB;
 
+-- Subscription System
+CREATE TABLE IF NOT EXISTS subscriptions (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    fingerprint VARCHAR(255) NOT NULL,
+    plan ENUM('free', 'basic', 'pro', 'annual') DEFAULT 'free',
+    started_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    expires_at TIMESTAMP NULL,
+    is_active TINYINT(1) DEFAULT 1,
+    payment_ref VARCHAR(255),
+    INDEX (fingerprint),
+    INDEX (expires_at)
+) ENGINE=InnoDB;
+
+-- Daily Usage Quotas
+CREATE TABLE IF NOT EXISTS daily_usage (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    fingerprint VARCHAR(255) NOT NULL,
+    usage_date DATE NOT NULL,
+    rides_accepted INT DEFAULT 0,
+    UNIQUE KEY unique_daily (fingerprint, usage_date),
+    INDEX (fingerprint)
+) ENGINE=InnoDB;
+
 -- Table to store driver locations for map updating
 CREATE TABLE IF NOT EXISTS driver_locations (
     id BIGINT AUTO_INCREMENT PRIMARY KEY,