diff --git a/package-lock.json b/package-lock.json
index 0676b23d..e3e2bb75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,8 +25,8 @@
         "@reduxjs/toolkit": "^2.2.8",
         "@tanstack/react-virtual": "^3.10.9",
         "@typeberry/block": "0.0.1-447d5c4",
-        "@typeberry/jam-host-calls": "0.0.1-459ce0b",
-        "@typeberry/pvm-debugger-adapter": "0.1.0-83a3aec",
+        "@typeberry/jam-host-calls": "0.0.1-fece159",
+        "@typeberry/pvm-debugger-adapter": "0.1.0-fece159",
         "@typeberry/spectool-wasm": "0.20.8",
         "@uiw/react-codemirror": "^4.23.6",
         "blake2b": "^2.1.4",
@@ -3424,15 +3424,15 @@
       "integrity": "sha512-+WMDuqDU5sqJJmpsZQPIBOpcR7u1wVPxoM5uVUYTQN64WGU7Rz1meQ12tdZgDOzZpJTeYhDGow5yXwdIs8hgsA=="
     },
     "node_modules/@typeberry/jam-host-calls": {
-      "version": "0.0.1-459ce0b",
-      "resolved": "https://registry.npmjs.org/@typeberry/jam-host-calls/-/jam-host-calls-0.0.1-459ce0b.tgz",
-      "integrity": "sha512-oplWtQAjqG0LwM6cKk20i8AtN135k499J25HLyJU8qVO5LT29v26UGKRnbzYIKRuu7wFlbzk0vI6Zg3zFaKSaA==",
+      "version": "0.0.1-fece159",
+      "resolved": "https://registry.npmjs.org/@typeberry/jam-host-calls/-/jam-host-calls-0.0.1-fece159.tgz",
+      "integrity": "sha512-rQyXVohcZqHo6HGDgi0LKGlDzobL/zJ8B7FU2V1yuCBGmXL8+Mw8KTlhhrTPtDjTcocFELd5F78r49qxTzjqog==",
       "license": "MPL-2.0"
     },
     "node_modules/@typeberry/pvm-debugger-adapter": {
-      "version": "0.1.0-83a3aec",
-      "resolved": "https://registry.npmjs.org/@typeberry/pvm-debugger-adapter/-/pvm-debugger-adapter-0.1.0-83a3aec.tgz",
-      "integrity": "sha512-sDzgfw6oVqBWvcAbwFHAPquYowW0hkSxTKIcirNqfgxhmFvwA6O+6QAJmdh4WH/WenXsAsLasXQTsa8JBqO03w==",
+      "version": "0.1.0-fece159",
+      "resolved": "https://registry.npmjs.org/@typeberry/pvm-debugger-adapter/-/pvm-debugger-adapter-0.1.0-fece159.tgz",
+      "integrity": "sha512-tJP/Zhnlddrph1IDDlA9eaG4qa7XQvxIQYp8bNcHHV2RMtjDYV+NmgPhTdueiojxjGF+EcT2/s/wJCrQpTvRrg==",
       "license": "MPL-2.0"
     },
     "node_modules/@typeberry/spectool-wasm": {
diff --git a/package.json b/package.json
index 3e60b0cd..9b79b7fa 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
     "@reduxjs/toolkit": "^2.2.8",
     "@tanstack/react-virtual": "^3.10.9",
     "@typeberry/block": "0.0.1-447d5c4",
-    "@typeberry/jam-host-calls": "0.0.1-459ce0b",
-    "@typeberry/pvm-debugger-adapter": "0.1.0-83a3aec",
+    "@typeberry/jam-host-calls": "0.0.1-fece159",
+    "@typeberry/pvm-debugger-adapter": "0.1.0-fece159",
     "@typeberry/spectool-wasm": "0.20.8",
     "@uiw/react-codemirror": "^4.23.6",
     "blake2b": "^2.1.4",
diff --git a/src/components/ProgramTextLoader/index.tsx b/src/components/ProgramTextLoader/index.tsx
index 9c534052..47d07d74 100644
--- a/src/components/ProgramTextLoader/index.tsx
+++ b/src/components/ProgramTextLoader/index.tsx
@@ -5,6 +5,7 @@ import { bytes } from "@typeberry/block";
 import { logger } from "@/utils/loggerService";
 import { useAppSelector } from "@/store/hooks.ts";
 import { selectIsProgramInvalid } from "@/store/debugger/debuggerSlice.ts";
+import { ProgramEdit } from "../ProgramEdit";
 
 const parseArrayLikeString = (input: string): (number | string)[] => {
   // Remove the brackets and split the string by commas
@@ -15,7 +16,7 @@ const parseArrayLikeString = (input: string): (number | string)[] => {
 
   // Process each item
   return items.map((item) => {
-    if (/^(?:0x)?[0-9a-fA-F]+$/i.test(item)) {
+    if (/^0x[0-9a-fA-F]+$/i.test(item)) {
       return parseInt(item, 16);
     } else if (!isNaN(Number(item))) {
       return Number(item);
@@ -72,7 +73,6 @@ export const ProgramTextLoader = ({
         const parseTest = newInput.replace(/0x([a-fA-F0-9]+)/g, '"0x$1"');
         // Parse it just to check if it's a valid JSON
         JSON.parse(parseTest);
-
         const parsedJson = parseArrayLikeString(newInput);
         const programArray = parsedJson.filter((item) => typeof item === "number") as number[];
 
@@ -93,11 +93,9 @@ export const ProgramTextLoader = ({
   };
 
   return (
-    <div className="h-full">
+    <div className="h-full flex flex-col">
+      <ProgramEdit startSlot={<small>Edit program code bytes</small>} />
       <div className={classNames("h-full flex-auto flex gap-1 flex-col")}>
-        <p className="pb-2 mb-1">
-          <small>Edit program code bytes</small>
-        </p>
         <Textarea
           autoFocus
           className={classNames("w-full flex-auto font-mono text-base border-2 rounded-md", {
diff --git a/src/pages/DebuggerContent.tsx b/src/pages/DebuggerContent.tsx
index 016fc499..40c06ecf 100644
--- a/src/pages/DebuggerContent.tsx
+++ b/src/pages/DebuggerContent.tsx
@@ -1,7 +1,7 @@
 import { useAppDispatch, useAppSelector } from "@/store/hooks.ts";
 import { useDebuggerActions } from "@/hooks/useDebuggerActions.ts";
 import { useCallback, useRef } from "react";
-import { CurrentInstruction } from "@/types/pvm.ts";
+import { CurrentInstruction, RegistersArray } from "@/types/pvm.ts";
 import { setClickedInstruction, setIsProgramInvalid } from "@/store/debugger/debuggerSlice.ts";
 import { InitialLoadProgramCTA } from "@/components/InitialLoadProgramCTA";
 import { InstructionMode } from "@/components/Instructions/types.ts";
@@ -14,6 +14,7 @@ import { MemoryPreview } from "@/components/MemoryPreview";
 // import { KnowledgeBase } from "@/components/KnowledgeBase";
 import { MobileKnowledgeBase } from "@/components/KnowledgeBase/Mobile.tsx";
 import { HostCalls } from "@/components/HostCalls";
+import { Program } from "@typeberry/pvm-debugger-adapter";
 
 const DebuggerContent = () => {
   const dispatch = useAppDispatch();
@@ -80,12 +81,34 @@ const DebuggerContent = () => {
                         dispatch(setIsProgramInvalid(true));
                       }
 
+                      function tryAsSpi(program: number[]) {
+                        try {
+                          const { code, memory, registers } = Program.fromSpi(
+                            new Uint8Array(program),
+                            new Uint8Array(),
+                          );
+                          const regs = Array.from(registers.getAllU64()) as RegistersArray;
+                          return {
+                            program: Array.from(code) || [],
+                            initial: { ...initialState, regs, mem: memory },
+                            name: "custom",
+                          };
+                        } catch {
+                          return null;
+                        }
+                      }
+
                       if (!error && program) {
-                        debuggerActions.handleProgramLoad({
-                          initial: initialState,
-                          program: program || [],
-                          name: "custom",
-                        });
+                        const maybeSpi = tryAsSpi(program.slice());
+                        if (maybeSpi) {
+                          debuggerActions.handleProgramLoad(maybeSpi);
+                        } else {
+                          debuggerActions.handleProgramLoad({
+                            initial: initialState,
+                            program: program || [],
+                            name: "custom",
+                          });
+                        }
                       }
                     }}
                   />