diff --git a/Makefile b/Makefile
index a4d5a85..e84cc46 100644
--- a/Makefile
+++ b/Makefile
@@ -40,13 +40,13 @@ CXXFLAGS	:= $(CFLAGS)
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-g $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) $(WUPSSPECS)
 
-LIBS	:= -lwups -lwut -lz
+LIBS	:= -lwups -lwut -lz -lromfs
 
 #-------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level
 # containing include and lib
 #-------------------------------------------------------------------------------
-LIBDIRS	:= $(PORTLIBS) $(WUPS_ROOT) $(WUT_ROOT)
+LIBDIRS	:= $(PORTLIBS) $(WUPS_ROOT) $(WUT_ROOT) $(WUT_ROOT)/usr
 
 #-------------------------------------------------------------------------------
 # no real need to edit anything past this point unless you need to add additional
diff --git a/src/main.cpp b/src/main.cpp
index 64a2251..1640cc3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -167,7 +167,7 @@ DECL_FUNCTION(int32_t, MCP_TitleList, uint32_t handle, uint32_t *outTitleCount,
 
         // Check if the have bootTvTex and bootDrcTex that could be shown.
         if (StringTools::EndsWith(gFileInfos[j].name, ".wbf")) {
-            if (romfsMount("romfscheck", dirList.GetFilepath(i)) == 0) {
+            if (romfsMount("romfscheck", dirList.GetFilepath(i), RomfsSource_FileDescriptor) == 0) {
                 bool foundSplashScreens = true;
                 if (!FSUtils::CheckFile("romfscheck:/meta/bootTvTex.tga") && !FSUtils::CheckFile("romfscheck:/meta/bootTvTex.tga.gz")) {
                     foundSplashScreens = false;
@@ -223,53 +223,37 @@ DECL_FUNCTION(int32_t, MCP_GetTitleInfoByTitleAndDevice, uint32_t mcp_handle, ui
     return result;
 }
 
-typedef struct __attribute((packed)) {
-    uint32_t command;
-    uint32_t target;
-    uint32_t filesize;
-    uint32_t fileoffset;
-    char path[256];
-} LOAD_REQUEST;
-
-int32_t getRPXInfoForID(uint32_t id, romfs_fileInfo *info);
-
 DECL_FUNCTION(int32_t, ACPCheckTitleLaunchByTitleListTypeEx, MCPTitleListType *title, uint32_t u2) {
     if ((title->titleId & TITLE_ID_HOMEBREW_MASK) == TITLE_ID_HOMEBREW_MASK) {
         int32_t id = getIDByLowerTitleID(title->titleId & 0xFFFFFFFF);
         if (id >= 0) {
-            DEBUG_FUNCTION_LINE("Started homebrew");
+            DEBUG_FUNCTION_LINE("Starting a homebrew title");
+            OSDynLoad_Module module;
+
+            OSDynLoad_Error dyn_res = OSDynLoad_Acquire("homebrew_rpx_loader", &module);
+            if (dyn_res != OS_DYNLOAD_OK) {
+                OSFatal("Failed to acquire homebrew_rpx_loader");
+            }
+
+
+            bool (*loadRPXFromSDOnNextLaunch)(const std::string &path);
+            dyn_res = OSDynLoad_FindExport(module, false, "loadRPXFromSDOnNextLaunch", reinterpret_cast<void **>(&loadRPXFromSDOnNextLaunch));
+            if (dyn_res != OS_DYNLOAD_OK) {
+                OSFatal("Failed to find export loadRPXFromSDOnNextLaunch");
+            }
+
             gHomebrewLaunched = TRUE;
             fillXmlForTitleID((title->titleId & 0xFFFFFFFF00000000) >> 32, (title->titleId & 0xFFFFFFFF), &gLaunchXML);
 
-            LOAD_REQUEST request;
-            memset(&request, 0, sizeof(request));
-
-            request.command = 0xFC; // IPC_CUSTOM_LOAD_CUSTOM_RPX;
-            request.target = 0;     // LOAD_FILE_TARGET_SD_CARD
-            request.filesize = 0;   // unknown
-            request.fileoffset = 0; //
-
             romfs_fileInfo info;
             int res = getRPXInfoForID(id, &info);
             if (res >= 0) {
-                request.filesize = ((uint32_t *) &info.length)[1];
-                request.fileoffset = ((uint32_t *) &info.offset)[1];
                 loadFileIntoBuffer((title->titleId & 0xFFFFFFFF), "meta/iconTex.tga", gIconCache, sizeof(gIconCache));
             }
 
-            strncpy(request.path, gFileInfos[id].path, 255);
-
-
-            DEBUG_FUNCTION_LINE("Loading file %s size: %08X offset: %08X", request.path, request.filesize, request.fileoffset);
-
-            DCFlushRange(&request, sizeof(LOAD_REQUEST));
-
-            int mcpFd = IOS_Open("/dev/mcp", (IOSOpenMode) 0);
-            if (mcpFd >= 0) {
-                int out = 0;
-                IOS_Ioctl(mcpFd, 100, &request, sizeof(request), &out, sizeof(out));
-                IOS_Close(mcpFd);
-            }
+            unmountRomfs(id);
+            loadRPXFromSDOnNextLaunch(gFileInfos[id].path);
+            mountRomfs(id);
             return 0;
         } else {
             DEBUG_FUNCTION_LINE("Failed to get the id for titleID %016llX", title->titleId);
diff --git a/src/romfs_helper.cpp b/src/romfs_helper.cpp
index ced170f..f2dfd56 100644
--- a/src/romfs_helper.cpp
+++ b/src/romfs_helper.cpp
@@ -42,16 +42,17 @@ bool mountRomfs(uint32_t id) {
     }
     if (!gFileInfos[id].romfsMounted) {
         char buffer[256];
-        snprintf(buffer, 256, "fs:/vol/external01/%s", gFileInfos[id].path);
+        snprintf(buffer, 256, "/vol/external01/%s", gFileInfos[id].path);
         char romName[10];
         snprintf(romName, 10, "%08X", id);
         DEBUG_FUNCTION_LINE("Mount %s as %s", buffer, romName);
-        if (romfsMount(romName, buffer) == 0) {
+        int32_t  res = 0;
+        if ((res = romfsMount(romName, buffer, RomfsSource_FileDescriptor_CafeOS)) == 0) {
             DEBUG_FUNCTION_LINE("Mounted successfully ");
             gFileInfos[id].romfsMounted = true;
             return true;
         } else {
-            DEBUG_FUNCTION_LINE("Mounting failed");
+            DEBUG_FUNCTION_LINE("Mounting failed %d", res);
             return false;
         }
     }
@@ -78,7 +79,7 @@ int32_t getRPXInfoForID(uint32_t id, romfs_fileInfo *info) {
     int res = -3;
     while ((entry = readdir(dir)) != NULL) {
         if (StringTools::EndsWith(entry->d_name, ".rpx")) {
-            if (romfs_GetFileInfoPerPath(romName, entry->d_name, info) >= 0) {
+            if (romfsGetFileInfoPerPath(romName, entry->d_name, info) >= 0) {
                 found = true;
                 res = 0;
             }
diff --git a/src/romfs_helper.h b/src/romfs_helper.h
index 64f0277..a053dbb 100644
--- a/src/romfs_helper.h
+++ b/src/romfs_helper.h
@@ -1,8 +1,7 @@
 #pragma once
+#include <cstdint>
 
-#include <stdint.h>
-#include <stdbool.h>
-#include <wut_romfs_dev.h>
+#include <romfs_dev.h>
 
 typedef struct WUT_PACKED FileInfos_ {
     char path[256];