diff --git a/Catamaran/Catamaran/CollectionGenericObjects/StorageCollection.cs b/Catamaran/Catamaran/CollectionGenericObjects/StorageCollection.cs
index ad308ef..7ca5dd6 100644
--- a/Catamaran/Catamaran/CollectionGenericObjects/StorageCollection.cs
+++ b/Catamaran/Catamaran/CollectionGenericObjects/StorageCollection.cs
@@ -77,41 +77,41 @@ namespace Catamaran.CollectionGenericObjects
                 File.Delete(filename);
             }
 
-            StringBuilder sb = new();
-
-            sb.Append(_collectionKey);
-            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
+            
+            using (StreamWriter writer = new(filename))
             {
-                sb.Append(Environment.NewLine);
-                if (value.Value.Count == 0)
+                writer.Write(_collectionKey);
+                foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
                 {
-                    continue;
-                }
-
-                sb.Append(value.Key);
-                sb.Append(_separatorKeyValue);
-                sb.Append(value.Value.GetCollectionType);
-                sb.Append(_separatorKeyValue);
-                sb.Append(value.Value.MaxCount);
-                sb.Append(_separatorKeyValue);
-
-                foreach (T? item in value.Value.GetItems())
-                {
-                    string data = item?.GetDataForSave() ?? string.Empty;
-                    if (string.IsNullOrEmpty(data))
+                    writer.Write(Environment.NewLine);
+                    if (value.Value.Count == 0)
                     {
                         continue;
                     }
 
-                    sb.Append(data);
-                    sb.Append(_separatorItems);
-                }
-            }
+                    writer.Write(value.Key);
+                    writer.Write(_separatorKeyValue);
+                    writer.Write(value.Value.GetCollectionType);
+                    writer.Write(_separatorKeyValue);
+                    writer.Write(value.Value.MaxCount);
+                    writer.Write(_separatorKeyValue);
 
-            using FileStream fs = new(filename, FileMode.Create);
-            byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
-            fs.Write(info, 0, info.Length);
-            fs.Close();
+                    foreach (T? item in value.Value.GetItems())
+                    {
+                        string data = item?.GetDataForSave() ?? string.Empty;
+                        if (string.IsNullOrEmpty(data))
+                        {
+                            continue;
+                        }
+
+                        writer.Write(data);
+                        writer.Write(_separatorItems);
+                    }
+                }
+                writer.Close();
+                
+            }
+            
             return true;
         }
 
@@ -122,58 +122,50 @@ namespace Catamaran.CollectionGenericObjects
                 return false;
             }
 
-            string bufferTextFromFile = "";
-            using (FileStream fs = new(filename, FileMode.Open))
+            using (StreamReader reader = new(filename))
             {
-                byte[] b = new byte[fs.Length];
-                UTF8Encoding temp = new(true);
-                while (fs.Read(b, 0, b.Length) > 0)
+                string line = reader.ReadLine();
+                if (line == null || line.Length == 0)
                 {
-                    bufferTextFromFile += temp.GetString(b);
+                    return false;
                 }
-            }
-
-            string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
-            if (strs == null || strs.Length == 0)
-            {
-                return false;
-            }
-
-            if (!strs[0].Equals(_collectionKey))
-            {
-                return false;
-            }
-
-            _storages.Clear();
-            foreach (string data in strs)
-            {
-                string[] record = data.Split(_separatorKeyValue, StringSplitOptions.RemoveEmptyEntries);
-                if (record.Length != 4)
-                {
-                    continue;
-                }
-
-                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-                if (collection == null)
+                if (!line.Equals(_collectionKey))
                 {
                     return false;
                 }
 
-                collection.MaxCount = Convert.ToInt32(record[2]);
-
-                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-                foreach (string elem in set)
+                _storages.Clear();
+                while ((line = reader.ReadLine()) != null)
                 {
-                    if (elem?.CreateDrawingBoat() is T boat)
+                    string[] record = line.Split(_separatorKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                    if (record.Length != 4)
                     {
-                        if (collection.Insert(boat) < 0)
+                        continue;
+                    }
+
+                    CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
+                    ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
+                    if (collection == null)
+                    {
+                        return false;
+                    }
+
+                    collection.MaxCount = Convert.ToInt32(record[2]);
+
+                    string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                    foreach (string elem in set)
+                    {
+                        if (elem?.CreateDrawingBoat() is T boat)
                         {
-                            return false;
+                            if (collection.Insert(boat) < 0)
+                            {
+                                return false;
+                            }
                         }
                     }
+                    _storages.Add(record[0], collection);
+
                 }
-                
             }
             return true;
         }