diff --git a/lib/new_views/common_widgets/app_bottom_nav_bar.dart b/lib/new_views/common_widgets/app_bottom_nav_bar.dart
index 5de1cec8..a965f45d 100644
--- a/lib/new_views/common_widgets/app_bottom_nav_bar.dart
+++ b/lib/new_views/common_widgets/app_bottom_nav_bar.dart
@@ -22,7 +22,7 @@ class AppBottomNavigationBar extends StatelessWidget {
     List<NavItemModel> navItems = [
       NavItemModel(0, "overview", context.translation.overview),
       NavItemModel(1, "request_icon", context.translation.workOrder),
-      // if ((isEngineer) || !isEngineer)
+      if (!isEngineer||isUserFMS)
         NavItemModel(2, "add_icon", context.translation.calendar, showLabel: false),
       NavItemModel(3, "assets", context.translation.assets),
       NavItemModel(4, "contact", context.translation.contact),
diff --git a/lib/new_views/pages/land_page/create_request-type_bottomsheet.dart b/lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
index 971ce78b..671d91fc 100644
--- a/lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
+++ b/lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
@@ -91,12 +91,14 @@ class CreateRequestModel {
       if (Provider.of<SettingProvider>(context, listen: false).engineerCanCreateCM) {
         list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateNewRequest.id));
       }
-      list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id));
+      //TODO uncommit this to enable task.
+      // list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id));
     } else {
       list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateNewRequest.id));
       list.add(CreateRequestModel(context.translation.gasRefill, "add_icon", GasRefillRequestForm.routeName));
       list.add(CreateRequestModel(context.translation.transferAsset, "add_icon", CreateDeviceTransferRequest.id));
-      list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id));
+      //TODO uncommit this to enable task.
+      // list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id));
     }
     return list;
   }
diff --git a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
index fb0d7512..550bb942 100644
--- a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
+++ b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
@@ -63,7 +63,8 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
       context.translation.gasRefill: 2,
       context.translation.transferAsset: 3,
       context.translation.preventiveMaintenance: 4,
-      context.translation.task: 6,
+      //TODO unCommit this to enable task.
+      // context.translation.task: 6,
     };
     if (isEngineer) {
       types.addAll({context.translation.recurrentWo: 5});
diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart
index 21674777..5f1b9d1e 100644
--- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart
+++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart
@@ -43,7 +43,8 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
       if (Provider.of<UserProvider>(context, listen: false).user!.type != UsersTypes.normal_user) {
         requestsList.add(Request(5, context.translation.recurrentWo));
       }
-      requestsList.add(Request(6, context.translation.taskRequest));
+      //TODO unCommit this to enable task
+      // requestsList.add(Request(6, context.translation.taskRequest));
 
       _provider = Provider.of<AllRequestsProvider>(context, listen: false);
       _provider!.reset();