diff --git a/CoviDok/BLL/User/Handlers/ICaseHandler.cs b/CoviDok/BLL/User/Handlers/ICaseHandler.cs
index dbc04e0..a6e7ffc 100644
--- a/CoviDok/BLL/User/Handlers/ICaseHandler.cs
+++ b/CoviDok/BLL/User/Handlers/ICaseHandler.cs
@@ -17,10 +17,11 @@ namespace CoviDok.BLL.User.Handlers
 
         public Task UpdateCase(int id, Case Case, Update update);
 
-        public Task SetCase(int id, CaseStatus status);
+        public Task SetCase(int id, CaseStatus status, Update message);
         public bool IsAuthorized(int ID, Case c);
 
         public List<Update> GetUpdatesForCase(int id);
         public Update GetUpadte(int id);
+        public bool IsAssistantOfDoctor(int id, int doctorID);
     }
 }
diff --git a/CoviDok/BLL/User/Managers/CaseManager.cs b/CoviDok/BLL/User/Managers/CaseManager.cs
index c6dc056..33b754e 100644
--- a/CoviDok/BLL/User/Managers/CaseManager.cs
+++ b/CoviDok/BLL/User/Managers/CaseManager.cs
@@ -39,7 +39,14 @@ namespace CoviDok.BLL.User.Managers
             if (c == null) throw new KeyNotFoundException();
             if (handler.IsAuthorized(s.ID, c) && s.Type == Api.Role.Ast)
             {
-                await handler.SetCase(id, CaseStatus.Cured);
+                Update update = new Update { 
+                CaseID = c.Id,
+                SenderID = s.ID,
+                SenderRole = s.Type,
+                CreatedDate = DateTime.Now,
+                Content = "Case set to 'Certified'"
+                };
+                await handler.SetCase(id, CaseStatus.Cured, update);
             }
             else
             {
@@ -53,7 +60,15 @@ namespace CoviDok.BLL.User.Managers
             if (c == null) throw new KeyNotFoundException();
             if (s.ID == c.DoctorID)
             {
-                await handler.SetCase(id, CaseStatus.Cured);
+                Update update = new Update
+                {
+                    CaseID = c.Id,
+                    SenderID = s.ID,
+                    SenderRole = s.Type,
+                    CreatedDate = DateTime.Now,
+                    Content = "Case set to 'Cured'"
+                };
+                await handler.SetCase(id, CaseStatus.Cured, update);
             }
             else
             {
@@ -131,7 +146,7 @@ namespace CoviDok.BLL.User.Managers
                     Content = updateMsg,
                     CreatedDate = DateTime.Now,
                     Images = Images
-                };
+                };                
                 await handler.UpdateCase(id, c, update);
             }
             else
diff --git a/CoviDok/Controllers/AssistantController.cs b/CoviDok/Controllers/AssistantController.cs
index d97e56e..f036d37 100644
--- a/CoviDok/Controllers/AssistantController.cs
+++ b/CoviDok/Controllers/AssistantController.cs
@@ -22,7 +22,7 @@ namespace CoviDok.Controllers
 
 
         [HttpGet("{id}")]
-        public async Task<ActionResult<PublicAssistant>> GetDoctor(int id)
+        public async Task<ActionResult<PublicAssistant>> GetAssistant(int id)
         {
             try
             {
diff --git a/CoviDok/Data/Model/Image.cs b/CoviDok/Data/Model/Image.cs
new file mode 100644
index 0000000..57597bc
--- /dev/null
+++ b/CoviDok/Data/Model/Image.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace CoviDok.Data.Model
+{
+    public class Image
+    {
+        public int Id { get; set; }
+        public int UpdateID { get; set; }
+        public string ImageID { get; set; }
+    }
+}
diff --git a/CoviDok/Data/MySQL/MySqlCaseHandler.cs b/CoviDok/Data/MySQL/MySqlCaseHandler.cs
index b186371..ea15c94 100644
--- a/CoviDok/Data/MySQL/MySqlCaseHandler.cs
+++ b/CoviDok/Data/MySQL/MySqlCaseHandler.cs
@@ -21,10 +21,13 @@ namespace CoviDok.Data.MySQL
             return c;
         }
 
-        public async Task SetCase(int id, CaseStatus status)
+        public async Task SetCase(int id, CaseStatus status, Update message)
         {
             Case c = await context.Cases.FindAsync(id);
+            message.CaseID = c.Id;
+            context.Updates.Add(message);
             c.CaseStatus = status;
+            c.Updates.Add(message);
             await context.SaveChangesAsync();
         }
 
@@ -35,7 +38,17 @@ namespace CoviDok.Data.MySQL
 
         public Update GetUpadte(int id)
         {
-            return (from u in context.Updates where u.Id == id select u).First();
+            Update update = (from u in context.Updates where u.Id == id select u).First();
+            if (update != null)
+            {
+                update.Images = (from i in context.Images where i.UpdateID == update.Id select i.ImageID).ToList();
+            }
+            return update;
+        }
+
+        public bool IsAssistantOfDoctor(int id, int doctorID)
+        {
+            return context.Assistants.Any( (a) => a.Id == id && a.DoctorId == doctorID);
         }
 
         public async Task<List<Case>> Filter(CaseFilter filter)
@@ -81,6 +94,15 @@ namespace CoviDok.Data.MySQL
             string[] forbidden = { "Updates" };
             PropertyCopier<Case>.Copy(Case, c, forbidden);
             context.Updates.Add(update);
+            foreach (string ImageID in update.Images)
+            {
+                Image image = new Image
+                {
+                    UpdateID = update.Id,
+                    ImageID = ImageID
+                };
+                context.Images.Add(image);
+            }
             update.CreatedDate = DateTime.Now;
             c.Updates.Add(update);
             await context.SaveChangesAsync();
diff --git a/CoviDok/Data/MySQL/MySqlContext.cs b/CoviDok/Data/MySQL/MySqlContext.cs
index 22368a0..4b2e552 100644
--- a/CoviDok/Data/MySQL/MySqlContext.cs
+++ b/CoviDok/Data/MySQL/MySqlContext.cs
@@ -15,8 +15,8 @@ namespace CoviDok.Data.MySQL
         public DbSet<Child> Children { get; set; }
         public DbSet<Case> Cases { get; set; }
         public DbSet<Update> Updates { get; set; }
-
         public DbSet<RoleUser> RoleUsers { get; set; }
+        public DbSet<Image> Images { get; set; }
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             optionsBuilder.UseMySQL("server=mysql;database=covidok;user=covidok;password=covidok");