diff --git a/rtl/axi4_to_wishbone.sv b/rtl/axi4_to_wishbone.sv
new file mode 100644
index 0000000..6f3e4d1
--- /dev/null
+++ b/rtl/axi4_to_wishbone.sv
@@ -0,0 +1,168 @@
+module axi4_to_wishbone_simple #(
+    parameter ADDR_WIDTH = 32,
+    parameter DATA_WIDTH = 32,
+    parameter ID_WIDTH   = 4
+)(
+    input  logic clk,
+    input  logic rst_n,
+
+    // AXI Write Address Channel
+    input  logic [ID_WIDTH-1:0]    S_AXI_AWID,
+    input  logic [ADDR_WIDTH-1:0]  S_AXI_AWADDR,
+    input  logic                   S_AXI_AWVALID,
+    output logic                   S_AXI_AWREADY,
+
+    // AXI Write Data Channel
+    input  logic [DATA_WIDTH-1:0]  S_AXI_WDATA,
+    input  logic [(DATA_WIDTH/8)-1:0] S_AXI_WSTRB,
+    input  logic                   S_AXI_WVALID,
+    output logic                   S_AXI_WREADY,
+
+    // AXI Write Response Channel
+    output logic [ID_WIDTH-1:0]    S_AXI_BID,
+    output logic [1:0]             S_AXI_BRESP,
+    output logic                   S_AXI_BVALID,
+    input  logic                   S_AXI_BREADY,
+
+    // AXI Read Address Channel
+    input  logic [ID_WIDTH-1:0]    S_AXI_ARID,
+    input  logic [ADDR_WIDTH-1:0]  S_AXI_ARADDR,
+    input  logic                   S_AXI_ARVALID,
+    output logic                   S_AXI_ARREADY,
+
+    // AXI Read Data Channel
+    output logic [ID_WIDTH-1:0]    S_AXI_RID,
+    output logic [DATA_WIDTH-1:0]  S_AXI_RDATA,
+    output logic [1:0]             S_AXI_RRESP,
+    output logic                   S_AXI_RVALID,
+    input  logic                   S_AXI_RREADY,
+
+    // Wishbone Interface
+    output logic                   WB_CYC,
+    output logic                   WB_STB,
+    output logic                   WB_WE,
+    output logic [ADDR_WIDTH-1:0]  WB_ADDR,
+    output logic [DATA_WIDTH-1:0]  WB_WDATA,
+    output logic [(DATA_WIDTH/8)-1:0] WB_SEL,
+    input  logic [DATA_WIDTH-1:0]  WB_RDATA,
+    input  logic                   WB_ACK
+);
+
+    // Estados
+    typedef enum logic [2:0] {
+        IDLE,
+        WB_WRITE,
+        WB_WRITE_RESP,
+        WB_READ,
+        WB_READ_RESP
+    } state_t;
+
+    state_t state, next_state;
+
+    // Registradores internos
+    logic [ADDR_WIDTH-1:0] addr_reg;
+    logic [DATA_WIDTH-1:0] wdata_reg;
+    logic [(DATA_WIDTH/8)-1:0] wstrb_reg;
+    logic [ID_WIDTH-1:0] id_reg;
+    logic is_write;
+
+    // FSM principal
+    always_ff @(posedge clk or negedge rst_n) begin
+        if (!rst_n) begin
+            state <= IDLE;
+        end else begin
+            state <= next_state;
+        end
+    end
+
+    always_comb begin
+        // Defaults
+        S_AXI_AWREADY = 0;
+        S_AXI_WREADY  = 0;
+        S_AXI_BVALID  = 0;
+        S_AXI_BRESP   = 2'b00;
+        S_AXI_BID     = id_reg;
+
+        S_AXI_ARREADY = 0;
+        S_AXI_RVALID  = 0;
+        S_AXI_RRESP   = 2'b00;
+        S_AXI_RDATA   = WB_RDATA;
+        S_AXI_RID     = id_reg;
+
+        WB_CYC  = 0;
+        WB_STB  = 0;
+        WB_WE   = 0;
+        WB_ADDR = addr_reg;
+        WB_WDATA = wdata_reg;
+        WB_SEL = wstrb_reg;
+
+        next_state = state;
+
+        case (state)
+            IDLE: begin
+                if (S_AXI_AWVALID && S_AXI_WVALID) begin
+                    next_state = WB_WRITE;
+                end else if (S_AXI_ARVALID) begin
+                    next_state = WB_READ;
+                end
+            end
+
+            WB_WRITE: begin
+                WB_CYC = 1;
+                WB_STB = 1;
+                WB_WE  = 1;
+                if (WB_ACK) begin
+                    next_state = WB_WRITE_RESP;
+                end
+            end
+
+            WB_WRITE_RESP: begin
+                S_AXI_BVALID = 1;
+                if (S_AXI_BREADY) begin
+                    next_state = IDLE;
+                end
+            end
+
+            WB_READ: begin
+                WB_CYC = 1;
+                WB_STB = 1;
+                if (WB_ACK) begin
+                    next_state = WB_READ_RESP;
+                end
+            end
+
+            WB_READ_RESP: begin
+                S_AXI_RVALID = 1;
+                if (S_AXI_RREADY) begin
+                    next_state = IDLE;
+                end
+            end
+        endcase
+    end
+
+    // Captura de endereço/dados
+    always_ff @(posedge clk or negedge rst_n) begin
+        if (!rst_n) begin
+            addr_reg <= 0;
+            wdata_reg <= 0;
+            wstrb_reg <= 0;
+            id_reg <= 0;
+        end else begin
+            if (state == IDLE) begin
+                if (S_AXI_AWVALID && S_AXI_WVALID) begin
+                    addr_reg  <= S_AXI_AWADDR;
+                    wdata_reg <= S_AXI_WDATA;
+                    wstrb_reg <= S_AXI_WSTRB;
+                    id_reg    <= S_AXI_AWID;
+                    S_AXI_AWREADY <= 1;
+                    S_AXI_WREADY  <= 1;
+                end else if (S_AXI_ARVALID) begin
+                    addr_reg  <= S_AXI_ARADDR;
+                    id_reg    <= S_AXI_ARID;
+                    S_AXI_ARREADY <= 1;
+                end
+            end
+        end
+    end
+
+endmodule
diff --git a/rtl/controller.sv b/rtl/controller.sv
index 2b0917b..058e7c3 100644
--- a/rtl/controller.sv
+++ b/rtl/controller.sv
@@ -160,7 +160,11 @@ always_ff @(posedge clk ) begin
         finish_execution <= 1'b0;
     else begin 
         if(bus_mode) begin
-            if(core_addr_i[5:0] == end_position[5:0])
+            if(core_addr_i[5:0] == end_position[5:0]
+            `ifdef ENABLE_SECOND_MEMORY
+            || data_mem_addr_i[5:0] == end_position[5:0]
+            `endif
+            )
                 finish_execution <= 1'b1;
         end else begin
             if(core_addr_i == end_position 
@@ -285,15 +289,15 @@ Memory #(
 ) Core_Data_Memory (
     .clk    (clk),
     
-    .cyc_i  (data_memory_cyc_i),
-    .stb_i  (data_memory_stb_i),
-    .we_i   (data_memory_we_i),
+    .cyc_i  (data_memory_cyc),
+    .stb_i  (data_memory_stb),
+    .we_i   (data_memory_we),
 
-    .addr_i (data_memory_addr_i),
-    .data_i (data_memory_data_i),
-    .data_o (data_memory_data_o),
+    .addr_i (data_memory_address),
+    .data_i (data_memory_write_data),
+    .data_o (data_memory_read_data),
 
-    .ack_o  (data_memory_ack_o)
+    .ack_o  (data_memory_ack)
 );
 `endif