diff --git a/lib/main.dart b/lib/main.dart
index d2ff00e..11cd24e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -32,6 +32,7 @@ Future<void> backgroundMessageHandler(RemoteMessage message) async {
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await GetStorage.init();
+
   if (Platform.isAndroid || Platform.isIOS) {
     await Firebase.initializeApp(
       options: DefaultFirebaseOptions.currentPlatform,
@@ -39,14 +40,18 @@ void main() async {
   }
 
   await FirebaseMessagesController().requestFirebaseMessagingPermission();
-  // await FirebasMessagesController().getNotificationSettings();
   await FirebaseMessagesController().getToken();
-  // await FirebasMessagesController().getTokens();
   LocationPermissions().locationPermissions();
   FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
-  // if (box.read(BoxName.driverID) != null) {
-  //   LocationController().startLocationUpdates();
-  // }
+
+  List<Future> initializationTasks = [
+    FirebaseMessagesController().getNotificationSettings(),
+    FirebaseMessagesController().getTokens(),
+    // Add more initialization tasks here
+  ];
+
+  await Future.wait(initializationTasks);
+
   runApp(const MyApp());
 }