diff --git a/CherryMerryGram.csproj b/CherryMerryGram.csproj
index 180fc72..0e36253 100644
--- a/CherryMerryGram.csproj
+++ b/CherryMerryGram.csproj
@@ -3,7 +3,8 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>CherryMerryGram</RootNamespace>
+	<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+	<RootNamespace>CherryMerryGram</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;ARM64</Platforms>
     <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
index 04559fd..18df386 100644
--- a/Properties/launchSettings.json
+++ b/Properties/launchSettings.json
@@ -1,7 +1,8 @@
 {
   "profiles": {
     "CherryMerryGram (Package)": {
-      "commandName": "MsixPackage"
+      "commandName": "MsixPackage",
+      
     },
     "CherryMerryGram (Unpackaged)": {
       "commandName": "Project"
diff --git a/Views/Chats/Chat.xaml.cs b/Views/Chats/Chat.xaml.cs
index 0e30e72..255ac0b 100644
--- a/Views/Chats/Chat.xaml.cs
+++ b/Views/Chats/Chat.xaml.cs
@@ -26,7 +26,7 @@ public async void UpdateChat(long chatId, string Title)
             await foreach (var message in messages)
             {
                 var messageEntry = new ChatMessage();
-                messageEntry.UpdateMessage(message: message);
+                //messageEntry.UpdateMessage(message: message);
                 MessagesList.Items.Add(messageEntry);
             }
         }
@@ -43,7 +43,7 @@ public async void UpdateChat(long chatId, string Title)
 
             foreach (var message in messages.Messages_)
             {
-                yield return message;
+                yield return messages;
             }
         }