diff --git a/Daybreak.API/Services/PartyService.cs b/Daybreak.API/Services/PartyService.cs
index 140e5565..f312f16c 100644
--- a/Daybreak.API/Services/PartyService.cs
+++ b/Daybreak.API/Services/PartyService.cs
@@ -397,24 +397,17 @@ public sealed class PartyService : IHostedService
             this.isPopulatingExtraBuilds = true;
             try
             {
-                // Create a child frame for each build beyond the first and populate it
+                // PopulateSkillTemplatePreview now handles the full lifecycle:
+                // creates a child frame with SkillFrameHandler, allocates context,
+                // creates sub-children (skill icons, labels), then populates with template data.
                 for (var i = 1; i < teamBuild.Builds.Count; i++)
                 {
-                    var childFrame = GWCA.GW.FrameMgr.CreateChildFrame(
-                        floatingFrame, 0, (uint)i, 0, 0, null);
-
-                    if (childFrame is null)
-                    {
-                        scopedLogger.LogWarning("Failed to create child frame for build {index}", i);
-                        continue;
-                    }
-
                     var template = new SkillTemplate();
                     PopulateSkillTemplate(teamBuild.Builds[i], &template);
 
-                    if (!GWCA.GW.FrameMgr.PopulateSkillTemplatePreview(childFrame, &template, 0))
+                    if (!GWCA.GW.FrameMgr.PopulateSkillTemplatePreview(floatingFrame, &template, (uint)i))
                     {
-                        scopedLogger.LogWarning("Failed to populate preview for build {index}", i);
+                        scopedLogger.LogWarning("Failed to create and populate preview for build {index}", i);
                         continue;
                     }
 
diff --git a/Dependencies/GWCA/gwca.dll b/Dependencies/GWCA/gwca.dll
index 7ed21180..338b1099 100644
Binary files a/Dependencies/GWCA/gwca.dll and b/Dependencies/GWCA/gwca.dll differ
diff --git a/Dependencies/GWCA/gwca.exp b/Dependencies/GWCA/gwca.exp
index 35331d11..397f60c9 100644
Binary files a/Dependencies/GWCA/gwca.exp and b/Dependencies/GWCA/gwca.exp differ