diff --git a/lib/models/task_model.dart b/lib/models/task_model.dart
index e55d3f8..e3686ae 100644
--- a/lib/models/task_model.dart
+++ b/lib/models/task_model.dart
@@ -6,8 +6,8 @@ class TaskModel {
   final String taskStatus;
   final String? taskPriority;
   final DateTime taskDueDate;
-  final TaskAssignedTo taskAssignedTo;
-  final String? taskAssignedBy;
+  final String? taskAssignedTo;
+  final TaskAssignedby? taskAssignedBy;
   final String? addedFor;
   final String? addedForId;
   final String? tradename;
@@ -42,9 +42,8 @@ class TaskModel {
       taskStatus: json['taskStatus'],
       taskPriority: json['taskPriority'],
       taskDueDate: DateTime.parse(json['taskDueDate']),
-      taskAssignedTo: TaskAssignedTo.fromJson(json['taskAssignedTo']),
-      taskAssignedBy: json['taskAssignedBy'],
-      addedFor: json['addedFor'],
+        taskAssignedTo:json["TaskAssignedTo"],
+      taskAssignedBy: TaskAssignedby.fromJson(json['taskAssignedBy']),
       addedForId: json['addedForId'],
       tradename: json['tradename'],
       createdAt: DateTime.parse(json['createdAt']),
@@ -54,21 +53,21 @@ class TaskModel {
   }
 }
 
-class TaskAssignedTo {
+class TaskAssignedby {
   final String id;
   final String name;
   final String mobileNumber;
   final String email;
 
-  TaskAssignedTo({
+  TaskAssignedby({
     required this.id,
     required this.name,
     required this.mobileNumber,
     required this.email,
   });
 
-  factory TaskAssignedTo.fromJson(Map<String, dynamic> json) {
-    return TaskAssignedTo(
+  factory TaskAssignedby.fromJson(Map<String, dynamic> json) {
+    return TaskAssignedby(
       id: json['_id'],
       name: json['name'],
       mobileNumber: json['mobileNumber'],
diff --git a/lib/provider/Announcement_Provider.dart b/lib/provider/Announcement_Provider.dart
index 91322aa..6192156 100644
--- a/lib/provider/Announcement_Provider.dart
+++ b/lib/provider/Announcement_Provider.dart
@@ -27,7 +27,7 @@ class AnnouncementProvider extends ChangeNotifier {
       Response response = await _apiClient.get(ApiUrls.announcementUrl); // Fetch announcements
       setLoading(false); // Set loading to false after the request completes
       if (response.statusCode == 200) {
-        final List<dynamic> data = response.data;
+        final List<dynamic> data = response.data['announcements']; // Extract data from response
         announcementList = data
             .map((item) => AnnouncementResponse.fromJson(item))
             .toList(); // Map JSON data to the announcement model
diff --git a/lib/provider/task_provider.dart b/lib/provider/task_provider.dart
index 9a20336..3257995 100644
--- a/lib/provider/task_provider.dart
+++ b/lib/provider/task_provider.dart
@@ -39,13 +39,12 @@ class TaskProvider extends ChangeNotifier {
   }
 
 
-
   Future<void> getAllTaskByDate(DateTime date) async {
     setLoading(true);
     try {
       final String formatedDate = DateFormat('dd/MM/yyyy').format(date);
       Response response =
-          await _apiClient.get("${ApiUrls.allTaskByDate}?Date=$formatedDate");
+      await _apiClient.get("${ApiUrls.allTaskByDate}?Date=$formatedDate");
       if (response.statusCode == 200) {
         List<TaskModel> data = (response.data['tasks'] as List)
             .map((json) => TaskModel.fromJson(json))
diff --git a/lib/screens/Announcements_Screen.dart b/lib/screens/Announcements_Screen.dart
index 02f5da6..99a5700 100644
--- a/lib/screens/Announcements_Screen.dart
+++ b/lib/screens/Announcements_Screen.dart
@@ -100,7 +100,7 @@ class MyListView extends StatelessWidget {
     Map<String, List<AnnouncementResponse>> groupedNotifications = {};
 
     // Iterate over the notification list and group by formatted date
-    for (var notification in value.announcementList.reversed) {
+    for (var notification in value.announcementList) {
       String date = DateFormat("dd MMM yyyy").format(DateTime.parse(notification.createdAt.toString()));
       if (!groupedNotifications.containsKey(date)) {
         groupedNotifications[date] = [];
diff --git a/lib/screens/calendar_screen.dart b/lib/screens/calendar_screen.dart
index 3c229b3..c2324b3 100644
--- a/lib/screens/calendar_screen.dart
+++ b/lib/screens/calendar_screen.dart
@@ -175,7 +175,7 @@ class _TaskListState extends State<TaskList> {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(
-                "Assigned to: ${task.taskAssignedTo.name}",
+                "Assigned by: ${task.taskAssignedBy!.name}",
                 style: const TextStyle(
                   fontFamily: 'Anek',
                   fontWeight: FontWeight.bold,