diff --git a/.vscode/launch.json b/.vscode/launch.json
index caf1d61..14723ae 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,7 +11,7 @@
             },
             "target": {
                 "server": "${workspaceFolder}/build/RelWithDebInfo/src/riscv-vp",
-                "serverParameters": ["--isa", "rv32gc|msu_vp", "-v", "INFO", "--disass", "-f", "fw/hello-world/hello.elf", "-g", "10000"],
+                "serverParameters": ["--isa", "rv32gc_msu", "-v", "INFO", "-f", "fw/hello-world/hello.elf", "-g", "10000"],
                 "watchServerProcess": true,
                 "port": "10000"
             },
@@ -50,7 +50,16 @@
             "name": "32bit VP with gdbserver",
             "cwd": "${workspaceRoot}",
             "program": "${workspaceFolder}/build/Debug/src/riscv-vp",
-            "arguments": "--isa 'rv32gc|msu_vp' -v INFO --disass -f fw/hello-world/hello.elf -g 10000",
+            "arguments": "--isa 'rv32gc_msu' -v INFO --disass -f fw/hello-world/hello.elf -g 10000",
+            "openGdbConsole": true
+        },
+        {
+            "type": "gdb",
+            "request": "launch",
+            "name": "32bit VP",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceFolder}/build/Debug/src/riscv-vp",
+            "arguments": "--isa 'rv32gc_msu' -v INFO --disass -f fw/hello-world/hello.elf",
             "openGdbConsole": true
         },
         {
@@ -59,7 +68,7 @@
             "name": "64bit VP with gdbserver",
             "cwd": "${workspaceRoot}",
             "program": "${workspaceFolder}/build/Debug/src/riscv-vp",
-            "arguments": "--isa 'rv64gc|msu_vp' -v INFO --disass -f fw/hello-world/hello.elf -g 10000",
+            "arguments": "--isa 'rv64gc_msu' -v INFO --disass -f fw/hello-world/hello.elf -g 10000",
             "openGdbConsole": true
         },
         {
@@ -68,7 +77,7 @@
             "name": "TGC5 VP",
             "cwd": "${workspaceRoot}",
             "program": "${workspaceFolder}/build/Debug/src/riscv-vp",
-            "arguments": "-v DEBUG -t 3 --isa 'tgc5c|mu_p' -f fw/hello-world/hello.elf",
+            "arguments": "-v DEBUG -t 3 --isa 'tgc5c_mu' -f fw/hello-world/hello.elf",
             "openGdbConsole": true
         },
         {
@@ -77,7 +86,7 @@
             "name": "TGC5 VP (asmjit)",
             "cwd": "${workspaceRoot}",
             "program": "${workspaceFolder}/build/Debug/src/riscv-vp",
-            "arguments": "-v DEBUG --isa 'tgc5c|mu_p' --backend asmjit -f fw/hello-world/hello.elf",
+            "arguments": "-v DEBUG --isa 'tgc5c_mu' --backend asmjit -f fw/hello-world/hello.elf",
             "openGdbConsole": true
         },
         {
diff --git a/dbt-rise-riscv b/dbt-rise-riscv
index de00067..29aac88 160000
--- a/dbt-rise-riscv
+++ b/dbt-rise-riscv
@@ -1 +1 @@
-Subproject commit de0006785ab1b8ef562c143803f3c152ab493a60
+Subproject commit 29aac88dbd62e59814430fec38a0397549b978a6
diff --git a/fw/hello-world/Makefile b/fw/hello-world/Makefile
index f980993..47ca309 100644
--- a/fw/hello-world/Makefile
+++ b/fw/hello-world/Makefile
@@ -2,10 +2,10 @@
 TARGET  = hello
 C_SRCS  = $(wildcard *.c) 
 HEADERS = $(wildcard *.h)
-CFLAGS += -O0 -g 
+CFLAGS += -Og -g 
 
 BOARD=riscv_vp
-LINK_TARGET=flash
+LINK_TARGET=rom
 RISCV_ARCH:=rv32imc
 RISCV_ABI:=ilp32
 #RISCV_ARCH:=rv64imc
diff --git a/fw/hello-world/hello.elf b/fw/hello-world/hello.elf
index 2dcce54..6ecfd97 100755
Binary files a/fw/hello-world/hello.elf and b/fw/hello-world/hello.elf differ