diff --git a/Model/Api/Order.php b/Model/Api/Order.php
index b206de9..d3a0364 100755
--- a/Model/Api/Order.php
+++ b/Model/Api/Order.php
@@ -3,6 +3,8 @@
 namespace Riskified\Decider\Model\Api;
 
 use Magento\Checkout\Model\Session;
+use Riskified\Decider\Model\Api\Order\Helper;
+use Riskified\Decider\Model\Api\Order\Log;
 use Riskified\OrderWebhook\Model;
 
 class Order
@@ -61,6 +63,7 @@ class Order
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
      */
     private $searchCriteriaBuilder;
+    private $session;
 
     /**
      * Order constructor.
@@ -89,6 +92,7 @@ public function __construct(
         \Riskified\Decider\Model\QueueFactory $queueFactory,
         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
         \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Framework\Session\SessionManager $sessionManager,
         \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
     ) {
         $this->_api = $api;
@@ -99,6 +103,7 @@ public function __construct(
         $this->_backendAuthSession = $backendAuthSession;
         $this->_messageManager = $messageManager;
         $this->logger = $logger;
+        $this->session = $sessionManager;
         $this->date = $date;
         $this->queueFactory = $queueFactory;
         $this->orderRepository = $orderRepository;
@@ -143,14 +148,17 @@ public function post($order, $action)
                     break;
                 case Api::ACTION_UPDATE:
                     $orderForTransport = $this->load($order);
+                    $this->logger->log(serialize($orderForTransport));
                     $response = $transport->updateOrder($orderForTransport);
                     break;
                 case Api::ACTION_SUBMIT:
                     $orderForTransport = $this->load($order);
+                    $this->logger->log(serialize($orderForTransport));
                     $response = $transport->submitOrder($orderForTransport);
                     break;
                 case Api::ACTION_CANCEL:
                     $orderForTransport = $this->_orderHelper->getOrderCancellation();
+                    $this->logger->log(serialize($orderForTransport));
                     $response = $transport->cancelOrder($orderForTransport);
                     break;
                 case Api::ACTION_FULFILL:
@@ -159,6 +167,7 @@ public function post($order, $action)
                     break;
                 case Api::ACTION_REFUND:
                     $orderForTransport = $this->loadRefund();
+                    $this->logger->log(serialize($orderForTransport));
                     $response = $transport->refundOrder($orderForTransport);
                     break;
             }
@@ -292,7 +301,7 @@ private function load($model)
             unset($order_array['browser_ip']);
             unset($order_array['cart_token']);
             $order_array['source'] = 'admin';
-        }else{
+        } else {
             $order_array['source'] = 'web';
         }
 
@@ -361,7 +370,7 @@ public function loadOrderByOrigId($full_orig_id)
 
         /**
          * validate if provided is is matching
-        */
+         */
         $order_id = false;
         $increment_id = false;
 
@@ -446,9 +455,9 @@ public function scheduleSubmissionRetry(\Magento\Sales\Model\Order $order, $acti
             if ($existingRetries->getSize() == 0) {
                 $queue = $this->queueFactory->create();
                 $queue->addData(array(
-                        'order_id' => $order->getId(),
-                        'action' => $action,
-                        'updated_at' => $this->date->gmtDate()
+                    'order_id' => $order->getId(),
+                    'action' => $action,
+                    'updated_at' => $this->date->gmtDate()
                 ))->save();
 
                 $this->logger->log("New retry scheduled successfully");
diff --git a/Model/Api/Order/Helper.php b/Model/Api/Order/Helper.php
index 933a4dd..3ff028f 100755
--- a/Model/Api/Order/Helper.php
+++ b/Model/Api/Order/Helper.php
@@ -440,10 +440,6 @@ public function getRefundDetails()
                 array_push($refundObjectCollection, $this->buildRefundDetailsObject($memo));
             }
         }
-        $currentMemo = $this->getCreditMemoFromRegistry();
-        if(!is_null($currentMemo)){
-            array_push($refundObjectCollection, $this->buildRefundDetailsObject($currentMemo));
-        }
 
         return $refundObjectCollection;
     }
diff --git a/Model/Observer/OrderPaymentRefund.php b/Model/Observer/OrderPaymentRefund.php
index 843ba5b..86bc4a3 100644
--- a/Model/Observer/OrderPaymentRefund.php
+++ b/Model/Observer/OrderPaymentRefund.php
@@ -53,9 +53,8 @@ public function __construct(
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         try {
-            $order = $observer->getPayment()->getOrder();
             $creditMemo = $observer->getEvent()->getCreditmemo();
-            $this->saveMemoInRegistry($creditMemo);
+            $order = $creditMemo->getOrder();
             $this->apiOrderLayer->post($order, Api::ACTION_REFUND);
         } catch (\Exception $e) {
             $this->messageManager->addErrorMessage(
diff --git a/Plugin/CsrfValidatorSkip.php b/Plugin/CsrfValidatorSkip.php
new file mode 100644
index 0000000..bd7f95c
--- /dev/null
+++ b/Plugin/CsrfValidatorSkip.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Riskified\Decider\Plugin;
+
+class CsrfValidatorSkip
+{
+    /**
+     * @param \Magento\Framework\App\Request\CsrfValidator $subject
+     * @param \Closure $proceed
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param \Magento\Framework\App\ActionInterface $action
+     */
+    public function aroundValidate(
+        $subject,
+        \Closure $proceed,
+        $request,
+        $action
+    ) {
+        if ($request->getModuleName() == 'decider') {
+            return;
+        }
+        $proceed($request, $action);
+    }
+}
\ No newline at end of file
diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml
index fa45db1..d3494fe 100755
--- a/etc/adminhtml/events.xml
+++ b/etc/adminhtml/events.xml
@@ -32,7 +32,7 @@
         <observer name="riskified_decider_order_update_declined"
                   instance="Riskified\Decider\Model\Observer\Order\Declined"/>
     </event>
-    <event name="sales_order_payment_refund">
+    <event name="sales_order_creditmemo_save_after">
         <observer name="riskified_sales_sales_order_payment_refund"
                   instance="Riskified\Decider\Model\Observer\OrderPaymentRefund"/>
     </event>
diff --git a/etc/di.xml b/etc/di.xml
index 6fa9a08..e927f08 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -33,4 +33,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\Request\CsrfValidator">
+        <plugin name="csrf_validator_skip" type="Riskified\Decider\Plugin\CsrfValidatorSkip" />
+    </type>
 </config>
\ No newline at end of file