diff --git a/DressAtelierBusinessLogic/BusinessLogic/ReportLogic.cs b/DressAtelierBusinessLogic/BusinessLogic/ReportLogic.cs
index 6ded0db..fa8e5e2 100644
--- a/DressAtelierBusinessLogic/BusinessLogic/ReportLogic.cs
+++ b/DressAtelierBusinessLogic/BusinessLogic/ReportLogic.cs
@@ -25,7 +25,6 @@ namespace DressAtelierBusinessLogic.BusinessLogic
         public ReportLogic(IDressStorage dressStorage, IMaterialStorage materialStorage, IOrderStorage orderStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
         {
             _dressStorage = dressStorage;
-            _materialStorage = materialStorage;
             _orderStorage = orderStorage;
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
@@ -34,7 +33,6 @@ namespace DressAtelierBusinessLogic.BusinessLogic
 
         public List<ReportDressMaterialViewModel> GetDressMaterial()
         {
-            var components = _materialStorage.GetFullList();
             var products = _dressStorage.GetFullList();
             var list = new List<ReportDressMaterialViewModel>();
             foreach (var product in products)
@@ -45,14 +43,11 @@ namespace DressAtelierBusinessLogic.BusinessLogic
                     Materials = new List<(string Material, int count)>(),
                     TotalAmount = 0
                 };
-                foreach (var material in components)
+                foreach (var material in product.DressComponents)
                 {
-                    if (product.DressComponents.ContainsKey(material.ID))
-                    {
-                        record.Materials.Add(new (material.ComponentName, product.DressComponents[material.ID].Item2));
-                        record.TotalAmount +=
-                       product.DressComponents[material.ID].Item2;
-                    }
+                    record.Materials.Add(new (material.Value.Item1.ComponentName, material.Value.Item2));
+                    record.TotalAmount += material.Value.Item2;
+                    
                 }
                 list.Add(record);
             }
diff --git a/DressAtelierDatabaseImplement/DressAtelierDatabase.cs b/DressAtelierDatabaseImplement/DressAtelierDatabase.cs
index 210b272..bf8921a 100644
--- a/DressAtelierDatabaseImplement/DressAtelierDatabase.cs
+++ b/DressAtelierDatabaseImplement/DressAtelierDatabase.cs
@@ -15,7 +15,7 @@ namespace DressAtelierDatabaseImplementation
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseSqlServer(@"Server=(localdb)\mssqllocaldb;Initial Catalog=DressAtelierDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Server=localhost\SQLEXPRESS;Initial Catalog=DressAtelierDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }
diff --git a/DressAtelierDatabaseImplement/Implements/OrderStorage.cs b/DressAtelierDatabaseImplement/Implements/OrderStorage.cs
index 5366bb5..be1eaf3 100644
--- a/DressAtelierDatabaseImplement/Implements/OrderStorage.cs
+++ b/DressAtelierDatabaseImplement/Implements/OrderStorage.cs
@@ -52,29 +52,21 @@ namespace DressAtelierDatabaseImplementation.Implements
             }
             context.Orders.Add(newOrder);
             context.SaveChanges();
-            return context.Orders.Include(x => x.Dress).FirstOrDefault(x => x.ID == model.ID)?.GetViewModel;
+            return context.Orders.Include(x => x.Dress).FirstOrDefault(x => x.ID == newOrder.ID)?.GetViewModel;
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
         {
             using var context = new DressAtelierDatabase();
-            using var transaction = context.Database.BeginTransaction();
-            try
+                       
+            var order = context.Orders.FirstOrDefault(x => x.ID == model.ID);
+            if(order == null)
             {
-                var order = context.Orders.FirstOrDefault(x => x.ID == model.ID);
-                if(order == null)
-                {
-                    return null;
-                }
-                order.Update(model);
-                context.SaveChanges();
-                return context.Orders.Include(x => x.Dress).FirstOrDefault(x => x.ID == model.ID)?.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
+                return null;
             }
+            order.Update(model);
+            context.SaveChanges();
+            return context.Orders.Include(x => x.Dress).FirstOrDefault(x => x.ID == model.ID)?.GetViewModel; 
         }
 
         public OrderViewModel? Delete(OrderBindingModel model)
@@ -87,7 +79,7 @@ namespace DressAtelierDatabaseImplementation.Implements
             }
             context.Orders.Remove(order);
             context.SaveChanges();           
-            return context.Orders.Include(x => x.Dress).FirstOrDefault(x => x.ID == model.ID)?.GetViewModel;
+            return order.GetViewModel;
         }
 
     }
diff --git a/DressAtelierDatabaseImplement/Models/Order.cs b/DressAtelierDatabaseImplement/Models/Order.cs
index 7bb3f53..6297c04 100644
--- a/DressAtelierDatabaseImplement/Models/Order.cs
+++ b/DressAtelierDatabaseImplement/Models/Order.cs
@@ -53,21 +53,6 @@ namespace DressAtelierDatabaseImplementation.Models
 
         }
 
-        public static Order Create(OrderViewModel model)
-        {
-            return new Order()
-            {
-                ID = model.ID,
-                DressID = model.DressID,
-                Count = model.Count,
-                Sum = model.Sum,
-                Status = model.Status,
-                DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement
-            };
-
-        }
-
         public void Update(OrderBindingModel? model)
         {
             if (model == null)
@@ -83,12 +68,13 @@ namespace DressAtelierDatabaseImplementation.Models
         {
             ID = ID,
             DressID = DressID,
+            DressName = Dress.DressName,
             Count = Count,
             Sum = Sum,
             Status = Status,
             DateCreate = DateCreate,
-            DateImplement = DateImplement,
-            DressName = Dress.DressName
+            DateImplement = DateImplement
+            
         };
 
     }
diff --git a/SewingDresses/Program.cs b/SewingDresses/Program.cs
index 073b342..0e2f355 100644
--- a/SewingDresses/Program.cs
+++ b/SewingDresses/Program.cs
@@ -3,7 +3,7 @@ using DressAtelierBusinessLogic.OfficePackage;
 using DressAtelierBusinessLogic.OfficePackage.Implements;
 using DressAtelierContracts.BusinessLogicContracts;
 using DressAtelierContracts.StorageContracts;
-using DressAtelierFileImplement.Implements;
+using DressAtelierDatabaseImplementation.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;