diff --git a/Api/CustomerPaymentTokenInterface.php b/Api/CustomerPaymentTokenInterface.php
new file mode 100644
index 0000000..bd0ef6b
--- /dev/null
+++ b/Api/CustomerPaymentTokenInterface.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Api;
+ 
+interface CustomerPaymentTokenInterface
+{
+    /**
+     * Get All Payment tokens
+     *
+     * @api
+     * @return mixed
+     */
+    public function getAllPaymentTokens();
+}
diff --git a/Api/Data/EditSubscriptionHistoryInterface.php b/Api/Data/EditSubscriptionHistoryInterface.php
new file mode 100644
index 0000000..aaed981
--- /dev/null
+++ b/Api/Data/EditSubscriptionHistoryInterface.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @copyright 2023 Sapient
+ */
+declare(strict_types=1);
+
+namespace Sapient\Worldpay\Api\Data;
+
+/**
+ * Api Data Interface EditSubscriptionHistoryInterface
+ */
+interface EditSubscriptionHistoryInterface
+{
+    public const ENTITY_ID = 'entity_id';
+    public const SUBSCRIPTION_ID = 'subscription_id';
+    public const CUSTOMER_ID = 'customer_id';
+    public const OLD_DATA = 'old_data';
+    public const CREATED_AT = 'created_at';
+    public const MODIFIED_DATE = 'modified_date';
+
+    /**
+     * Get Model entity_id property value
+     *
+     * @return string
+     */
+    public function getId();
+
+    /**
+     * Set Model id property value
+     *
+     * @param int $id
+     * @return int
+     */
+    public function setId(int $id);
+
+    /**
+     * Get SubscriptionId property value
+     *
+     * @return int|null
+     */
+    public function getSubscriptionId();
+
+    /**
+     * Set subscriptionId property value
+     *
+     * @param string $subscriptionId
+     * @return mixed
+     */
+    public function setSubscriptionId(int $subscriptionId);
+
+    /**
+     * Get customerId property value
+     *
+     * @return string
+     */
+    public function getCustomerId();
+
+    /**
+     * Set Model customerId property value
+     *
+     * @param int $customerId
+     * @return int
+     */
+    public function setCustomerId(int $customerId);
+
+    /**
+     * Get oldData property value
+     *
+     * @return mixed
+     */
+    public function getOldData();
+
+    /**
+     * Set oldData property value
+     *
+     * @param mixed $oldData
+     * @return mixed
+     */
+    public function setOldData(array $oldData);
+
+    /**
+     * Get CreatedAt property value
+     *
+     * @return bool|null
+     */
+    public function getCreatedAt();
+
+    /**
+     * Set CreatedAt property value
+     *
+     * @param string $createdAt
+     * @return mixed
+     */
+    public function setCreatedAt(string $createdAt);
+
+    /**
+     * Get Modified At property value
+     *
+     * @return string|null
+     */
+    public function getModifiedAt();
+
+    /**
+     * Set Model modifiedAt property value
+     *
+     * @param string $modifiedAt
+     * @return mixed
+     */
+    public function setModifiedAt(string $modifiedAt);
+}
diff --git a/Api/Data/SkipSubscriptionOrderInterface.php b/Api/Data/SkipSubscriptionOrderInterface.php
new file mode 100644
index 0000000..867d3a7
--- /dev/null
+++ b/Api/Data/SkipSubscriptionOrderInterface.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @copyright 2023 Sapient
+ */
+declare(strict_types=1);
+
+namespace Sapient\Worldpay\Api\Data;
+
+/**
+ * Interface EditSubscriptionHistoryInterface
+ *
+ */
+
+interface SkipSubscriptionOrderInterface
+{
+    public const ENTITY_ID = 'entity_id';
+    public const SUBSCRIPTION_ID = 'subscription_id';
+    public const CUSTOMER_ID = 'customer_id';
+    public const IS_SKIPPED = 'is_skipped';
+    public const OLD_RECURRING_DATE = 'old_recurring_date';
+    public const NEW_RECURRING_DATE = 'new_recurring_date';
+    public const CREATED_AT = 'created_at';
+    public const UPDATED_AT = 'updated_at';
+
+    /**
+     * Get Model'entity_id' property value
+     *
+     * @return string
+     */
+    public function getId();
+
+    /**
+     * Set Model id property value
+     *
+     * @param int $id
+     * @return int
+     */
+    public function setId(int $id);
+
+    /**
+     * Get SubscriptionId property value
+     *
+     * @return int|null
+     */
+    public function getSubscriptionId();
+
+    /**
+     * Set subscriptionId property value
+     *
+     * @param string $subscriptionId
+     * @return mixed
+     */
+    public function setSubscriptionId(int $subscriptionId);
+
+    /**
+     * Get CustomerId property value
+     *
+     * @return string
+     */
+    public function getCustomerId();
+
+    /**
+     * Set Model CustomerId property value
+     *
+     * @param int $customerId
+     * @return mixed
+     */
+    public function setCustomerId(int $customerId);
+ 
+    /**
+     * Get IsSkipped property value
+     *
+     * @return bool|null
+     */
+    public function getIsSkipped();
+
+    /**
+     * Set IsSkipped property value
+     *
+     * @param bool $isSkipped
+     * @return true|false
+     */
+    public function setIsSkipped($isSkipped);
+
+    /**
+     * Get NewRecurringDate property value
+     *
+     * @return string
+     */
+    public function getNewRecurringDate();
+
+    /**
+     * Set NewRecurringDate property value
+     *
+     * @param string $newRecurringDate
+     * @return mixed|null
+     */
+    public function setNewRecurringDate($newRecurringDate);
+
+    /**
+     * Get OldRecurringDate property value
+     *
+     * @return string|null
+     */
+    public function getOldRecurringDate();
+
+    /**
+     * Set Model OldRecurringDate property value
+     *
+     * @param string $oldRecurringDate
+     * @return mixed|null
+     */
+    public function setOldRecurringDate($oldRecurringDate);
+
+    /**
+     * Get OldRecurringDate property value
+     *
+     * @return string|null
+     */
+    public function getCreatedAt();
+
+    /**
+     * Set Model createdAt property value
+     *
+     * @param string $createdAt
+     * @return mixed|null
+     */
+    public function setCreatedAt($createdAt);
+
+    /**
+     * Get OldRecurringDate property value
+     *
+     * @return string|null
+     */
+    public function getUpdatedAt();
+
+    /**
+     * Set Model updatedAt property value
+     *
+     * @param string $updatedAt
+     * @return string|null
+     */
+    public function setUpdatedAt($updatedAt);
+}
diff --git a/Api/EditSubscriptionHistoryRepositoryInterface.php b/Api/EditSubscriptionHistoryRepositoryInterface.php
new file mode 100644
index 0000000..0095aea
--- /dev/null
+++ b/Api/EditSubscriptionHistoryRepositoryInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Sapient\Worldpay\Api;
+
+/**
+ * Interface EditSubscriptionHistoryRepositoryInterface
+ */
+interface EditSubscriptionHistoryRepositoryInterface
+{
+    /**
+     * Get getById
+     *
+     * @param int $id
+     * @return \Sapient\Worldpay\Api\Data\EditSubscriptionHistoryInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getById($id);
+
+    /**
+     * Save Subscription History
+     *
+     * @param \Sapient\Worldpay\Api\Data\EditSubscriptionHistoryInterface $editSubscriptionHistory
+     * @return mixed
+     */
+    public function save(\Sapient\Worldpay\Api\Data\EditSubscriptionHistoryInterface $editSubscriptionHistory): mixed;
+}
diff --git a/Api/RecurringShippingMethodInterface.php b/Api/RecurringShippingMethodInterface.php
new file mode 100644
index 0000000..5ddfa92
--- /dev/null
+++ b/Api/RecurringShippingMethodInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Api;
+ 
+interface RecurringShippingMethodInterface
+{
+    /**
+     * Retrive Shipping Method
+     *
+     * @api
+     * @param string $orderIncrementId
+     * @param string $addressId
+     * @return null|string
+     */
+    public function getShippingMethod($orderIncrementId, $addressId);
+}
diff --git a/Api/SkipSubscriptionOrderRepositoryInterface.php b/Api/SkipSubscriptionOrderRepositoryInterface.php
new file mode 100644
index 0000000..ac48d00
--- /dev/null
+++ b/Api/SkipSubscriptionOrderRepositoryInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Sapient\Worldpay\Api;
+
+/**
+ * Interface SkipSubscriptionOrderRepositoryInterface
+ */
+interface SkipSubscriptionOrderRepositoryInterface
+{
+    /**
+     * Get getById
+     *
+     * @param int $id
+     * @return \Sapient\Worldpay\Api\Data\SkipSubscriptionOrderInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getById($id);
+
+    /**
+     * Save Skip Subscription Order data
+     *
+     * @param \Sapient\Worldpay\Api\Data\SkipSubscriptionOrderInterface $skipSubscriptionOrder
+     * @return mixed
+     */
+    public function save(\Sapient\Worldpay\Api\Data\SkipSubscriptionOrderInterface $skipSubscriptionOrder): mixed;
+}
diff --git a/Api/UpdateRecurringShipmentInterface.php b/Api/UpdateRecurringShipmentInterface.php
new file mode 100644
index 0000000..a7cf1be
--- /dev/null
+++ b/Api/UpdateRecurringShipmentInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Api;
+ 
+interface UpdateRecurringShipmentInterface
+{
+    /**
+     * Update Recurring Shipment
+     *
+     * @api
+     * @param mixed $shipmentData
+     * @return string
+     */
+    public function updateRecurringShipment($shipmentData) : string;
+}
diff --git a/Api/UpdateRecurringTokenInterface.php b/Api/UpdateRecurringTokenInterface.php
new file mode 100644
index 0000000..413b092
--- /dev/null
+++ b/Api/UpdateRecurringTokenInterface.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Api;
+ 
+interface UpdateRecurringTokenInterface
+{
+    /**
+     * Update Recurring Token
+     *
+     * @api
+     * @param string $tokenId
+     * @param string $subscriptionId
+     *
+     * @return string
+     */
+    public function updateRecurringPaymentToken(string $tokenId, string $subscriptionId): string;
+}
diff --git a/Block/Adminhtml/System/Config/CsePopup.php b/Block/Adminhtml/System/Config/CsePopup.php
new file mode 100644
index 0000000..9881987
--- /dev/null
+++ b/Block/Adminhtml/System/Config/CsePopup.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Sapient, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Sapient\Worldpay\Block\Adminhtml\System\Config;
+
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+class CsePopup extends Field
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Sapient_Worldpay::system/config/csepopup.phtml';
+
+    /**
+     * Return element html
+     *
+     * @param  AbstractElement $element
+     * @return string
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        return $this->_toHtml();
+    }
+}
diff --git a/Block/Recurring/Customer/Subscriptions.php b/Block/Recurring/Customer/Subscriptions.php
index e17cc09..db46a32 100644
--- a/Block/Recurring/Customer/Subscriptions.php
+++ b/Block/Recurring/Customer/Subscriptions.php
@@ -194,4 +194,16 @@ public function getMyAccountSpecificException($exceptioncode)
     {
         return $this->recurringHelper->getMyAccountExceptions($exceptioncode);
     }
+
+    /**
+     * Get next recurring order
+     *
+     * @param int $subscriptionId
+     * @return array
+     */
+    public function getNextRecurringOrder($subscriptionId)
+    {
+        $customerId = $this->customerSession->getCustomerId();
+        return $this->recurringHelper->getNextRecurringOrder($subscriptionId, $customerId);
+    }
 }
diff --git a/Block/Recurring/Customer/Subscriptions/Edit.php b/Block/Recurring/Customer/Subscriptions/Edit.php
index 9964c3e..e41af88 100644
--- a/Block/Recurring/Customer/Subscriptions/Edit.php
+++ b/Block/Recurring/Customer/Subscriptions/Edit.php
@@ -16,12 +16,14 @@
 use Sapient\Worldpay\Model\Recurring\Plan;
 use Sapient\Worldpay\Model\Recurring\Subscription;
 use Sapient\Worldpay\Model\Recurring\SubscriptionFactory;
+use Sapient\Worldpay\Model\Recurring\Subscription\Transactions;
 use Magento\Directory\Helper\Data;
 
 //use Sapient\Worldpay\Model\Ui\CcConfigProvider;
 
 class Edit extends Template
 {
+    public const RECURRING_ORDER_SKIP_DAYS_UPTO = 9;
     /**
      * @var \Sapient\Worldpay\Model\Recurring\Subscription|null
      */
@@ -34,6 +36,10 @@ class Edit extends Template
      * @var SubscriptionFactory
      */
     private $subscriptionFactory;
+    /**
+     * @var CollectionFactory
+     */
+    private $transactionCollectionFactory;
     /**
      * @var Recurring
      */
@@ -62,6 +68,7 @@ class Edit extends Template
     /**
      * @param Template\Context $context
      * @param SubscriptionFactory $subscriptionFactory
+     * @param Transactions $recurringTransactions
      * @param Recurring $recurringHelper
      * @param ProductFactory $productFactory
      * @param IconsProvider $iconsProvider
@@ -73,6 +80,7 @@ class Edit extends Template
     public function __construct(
         Template\Context $context,
         SubscriptionFactory $subscriptionFactory,
+        Transactions $recurringTransactions,
         Recurring $recurringHelper,
         ProductFactory $productFactory,
         IconsProvider $iconsProvider,
@@ -83,6 +91,7 @@ public function __construct(
     ) {
         parent::__construct($context, $data);
         $this->subscriptionFactory = $subscriptionFactory;
+        $this->transactionCollectionFactory = $recurringTransactions;
         $this->recurringHelper = $recurringHelper;
         $this->productFactory = $productFactory;
         $this->tokenManager = $tokenManager;
@@ -149,6 +158,19 @@ public function getSaveUrl()
         );
     }
 
+    /**
+     * View All Recurring Order
+     *
+     * @return string
+     */
+    public function getViewAllRecurringOrder()
+    {
+        return $this->_urlBuilder->getUrl(
+            'worldpay/recurring_order/view/',
+            ['_secure' => true, 'subscription_id' => $this->getSubscription()->getId()]
+        );
+    }
+
     /**
      * Retrieve product subscription plans
      *
@@ -348,4 +370,45 @@ public function getCountriesWithOptionalZip($asJson)
     {
         return $this->helper->getCountriesWithOptionalZip($asJson);
     }
+
+    /**
+     * Get next recurring order
+     *
+     * @return array
+     */
+    public function getNextRecurringOrder()
+    {
+        $subscriptionId = $this->getSubscription()->getId();
+        $customerId = $this->customerSession->getCustomerId();
+        return $this->recurringHelper->getNextRecurringOrder($subscriptionId, $customerId);
+    }
+
+    /**
+     * Get Next recurring order date
+     *
+     * @return string
+     */
+    public function getNextOrderDate()
+    {
+        $nextOrder = $this->getNextRecurringOrder();
+        if (!empty($nextOrder)) {
+            return $nextOrder->getRecurringDate();
+        }
+        return false;
+    }
+
+    /**
+     * Get recurring count
+     *
+     * @return int
+     */
+    public function getRecurringOrderCollection()
+    {
+        $subscriptionId = $this->getRequest()->getParam('subscription_id');
+        $subscriptionCount = $this->transactionCollectionFactory->getCollection()
+                ->addFieldToFilter('subscription_id', ['eq' => $subscriptionId])
+                ->addFieldToFilter('status', ['eq' =>'completed']);
+        
+        return $subscriptionCount->getSize();
+    }
 }
diff --git a/Block/Recurring/Customer/Subscriptions/OrderInfo.php b/Block/Recurring/Customer/Subscriptions/OrderInfo.php
new file mode 100644
index 0000000..3770813
--- /dev/null
+++ b/Block/Recurring/Customer/Subscriptions/OrderInfo.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Sapient\Worldpay\Block\Recurring\Customer\Subscriptions;
+
+use Sapient\Worldpay\Model\Recurring\Subscription\Address;
+use Magento\Framework\View\Element\Template\Context as TemplateContext;
+use Magento\Framework\Registry;
+use Magento\Payment\Helper\Data as PaymentHelper;
+use Sapient\Worldpay\Model\Recurring\Order\Address\Renderer as AddressRenderer;
+use Magento\Customer\Helper\Address as CustomerAddressHelper;
+use Magento\Customer\Model\Address\Config as AddressConfig;
+
+class OrderInfo extends \Magento\Framework\View\Element\Template
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Sapient_Worldpay::recurring/edit/order_info.phtml';
+
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    protected $coreRegistry = null;
+
+    /**
+     * @var \Magento\Payment\Helper\Data
+     */
+    protected $paymentHelper;
+
+    /**
+     * @var AddressRenderer
+     */
+    protected $addressRenderer;
+
+      /**
+       * @var CustomerAddressHelper
+       */
+    protected $_customerAddressHelper;
+
+    /**
+     * @var \Magento\Customer\Model\Address\Mapper
+     */
+    protected $addressMapper;
+
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    protected $customerSession;
+
+     /**
+      * @var \Magento\Customer\Api\CustomerRepositoryInterface
+      */
+    protected $customerRepository;
+
+    /**
+     * @var \Magento\Customer\Model\Address\Config
+     */
+    protected $_addressConfig;
+    /**
+     * @param TemplateContext $context
+     * @param Registry $registry
+     * @param PaymentHelper $paymentHelper
+     * @param AddressRenderer $addressRenderer
+     * @param CustomerAddressHelper $customerAddressHelper
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param AddressConfig $addressConfig
+     * @param Mapper $addressMapper
+     * @param Session $customerSession
+     *
+     * @param array $data
+     */
+    public function __construct(
+        TemplateContext $context,
+        Registry $registry,
+        PaymentHelper $paymentHelper,
+        AddressRenderer $addressRenderer,
+        CustomerAddressHelper $customerAddressHelper,
+        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
+        AddressConfig $addressConfig,
+        \Magento\Customer\Model\Address\Mapper $addressMapper,
+        \Magento\Customer\Model\Session $customerSession,
+        array $data = []
+    ) {
+        $this->addressRenderer = $addressRenderer;
+        $this->paymentHelper = $paymentHelper;
+        $this->coreRegistry = $registry;
+        $this->_isScopePrivate = true;
+        $this->_customerAddressHelper = $customerAddressHelper;
+        $this->addressMapper = $addressMapper;
+        $this->customerSession  = $customerSession;
+        $this->_addressConfig  = $addressConfig;
+        $this->customerRepository  = $customerRepository;
+       
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Retrieve Current Customer data
+     *
+     * @return mixed
+     */
+    public function getCurrentCustomer()
+    {
+        return $this->customerSession->getCustomer();
+    }
+
+    /**
+     * Retrieve Current order model instance
+     *
+     * @return \Magento\Sales\Model\Order
+     */
+    public function getCurrentSubscriptionOrder()
+    {
+        return $this->coreRegistry->registry('current_subscription_order');
+    }
+
+    /**
+     * Returns string with formatted address
+     *
+     * @param Address $address
+     * @return null|string
+     */
+    public function getFormattedAddress(Address $address)
+    {
+        return $this->addressRenderer->format($address, 'html');
+    }
+
+    /**
+     * Retrieve Transaction Data
+     *
+     * @param Subscription $subscriptionOrder
+     * @return mixed
+     */
+    public function getTransactionData(\Sapient\Worldpay\Model\Recurring\Subscription $subscriptionOrder)
+    {
+        return $subscriptionOrder->getTransactionData();
+    }
+}
diff --git a/Block/Recurring/Customer/Subscriptions/OrderInfo/AddressInfo.php b/Block/Recurring/Customer/Subscriptions/OrderInfo/AddressInfo.php
new file mode 100644
index 0000000..05e8e6f
--- /dev/null
+++ b/Block/Recurring/Customer/Subscriptions/OrderInfo/AddressInfo.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Sapient\Worldpay\Block\Recurring\Customer\Subscriptions\OrderInfo;
+
+use Magento\Customer\Model\Address\Config as AddressConfig;
+
+class AddressInfo extends \Sapient\Worldpay\Block\Recurring\Customer\Subscriptions\OrderInfo
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Sapient_Worldpay::recurring/edit/order_address_info.phtml';
+    /**
+     * Retrieve Address Options
+     *
+     * @return mixed
+     */
+    public function getAddressOptions()
+    {
+        $options = $this->getData('address_options');
+        if ($options === null) {
+            $options = [];
+            $addresses = [];
+
+            try {
+                $currentCustomer = $this->getCurrentCustomer();
+                $addresses = $this->customerRepository->getById($currentCustomer->getId())->getAddresses();
+            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+                /** Customer does not exist */
+                throw new NoSuchEntityException(__('Customer does not exist'));
+            }
+            /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+            foreach ($addresses as $address) {
+                $label = $this->_addressConfig
+                    ->getFormatByCode(AddressConfig::DEFAULT_ADDRESS_FORMAT)
+                    ->getRenderer()
+                    ->renderArray($this->addressMapper->toFlatArray($address));
+
+                $options[] = [
+                    'value' => $address->getId(),
+                    'label' => $label,
+                ];
+            }
+            $this->setData('address_options', $options);
+        }
+
+        return $options;
+    }
+}
diff --git a/Block/SubscriptionOrders.php b/Block/SubscriptionOrders.php
new file mode 100644
index 0000000..f01f2cd
--- /dev/null
+++ b/Block/SubscriptionOrders.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * Copyright © 2023 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+namespace Sapient\Worldpay\Block;
+
+use Sapient\Worldpay\Model\SubscriptionOrder;
+
+class SubscriptionOrders extends \Magento\Framework\View\Element\Template
+{
+    /**
+     * @var SubscriptionOrder
+     */
+    protected $subscriptionOrder;
+
+    /**
+     * @var \Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder\Collection
+     */
+    private $subscriptionOrderCollection;
+
+    /**
+     * @var $orderRepository
+     */
+    protected $orderRepository;
+
+    /**
+     * @var \Magento\Framework\UrlInterface $urlInterface
+     */
+    protected $urlInterface;
+    /**
+     * Subscriptions block constructor.
+     *
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param SubscriptionOrder $subscriptionOrder
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Sapient\Worldpay\Helper\Recurring $recurringhelper
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Magento\Framework\UrlInterface $urlInterface
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        SubscriptionOrder $subscriptionOrder,
+        \Magento\Customer\Model\Session $customerSession,
+        \Sapient\Worldpay\Helper\Recurring $recurringhelper,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Magento\Framework\UrlInterface $urlInterface,
+        array $data = []
+    ) {
+        $this->subscriptionOrder = $subscriptionOrder;
+        $this->recurringhelper = $recurringhelper;
+        $this->orderRepository = $orderRepository;
+        $this->urlInterface = $urlInterface;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Retrieve Subscription Order Collection
+     *
+     * @return mixed
+     */
+    public function getsubscriptionOrderCollection()
+    {
+        $subscriptionId = $this->getRequest()->getParam('subscription_id');
+        $timeFilter = $this->getRequest()->getParam('timeFilter');
+        $timeFilterby = $this->subscriptionOrder
+            ->getFilterDate($timeFilter=null);
+        $subscriptionOrderCollection = $this->subscriptionOrder
+            ->getsubscriptionOrderCollection($subscriptionId, $timeFilterby);
+        
+        return $subscriptionOrderCollection;
+    }
+
+    /**
+     * My Account Labels
+     *
+     * @param string $labelCode
+     * @return $this
+     */
+
+    public function getMyAccountLabels($labelCode)
+    {
+        return $this->recurringhelper->getAccountLabelbyCode($labelCode);
+    }
+
+    /**
+     * Get subscription plan interval label
+     *
+     * @param string $interval
+     * @return string
+     */
+    public function getSubscriptionIntervalLabel($interval)
+    {
+        return $this->recurringhelper->getPlanIntervalLabel($interval);
+    }
+    
+    /**
+     * Specific Exception
+     *
+     * @param string $exceptioncode
+     * @return string
+     */
+
+    public function getMyAccountSpecificException($exceptioncode)
+    {
+        return $this->recurringhelper->getMyAccountExceptions($exceptioncode);
+    }
+    
+    /**
+     * Return Current Url
+     *
+     * @return string
+     */
+    public function getCurrentURL()
+    {
+        return $this->urlInterface->getCurrentUrl();
+    }
+  
+    /**
+     * Return  Order Filter URL
+     *
+     * @param string $timeVal
+     * @return string
+     */
+    public function getOrderFilterURL($timeVal)
+    {
+        $link = $this->getHistoryPageURL();
+        $paramsData = $this->getRequest()->getParams();
+        if (count($paramsData)) {
+            $link .= "?";
+            /* Page Number */
+            if (isset($paramsData['p'])) {
+                $link .= "p=" . $paramsData['p'] . "&";
+            }
+            /* Page Limit Number */
+            if (isset($paramsData['limit'])) {
+                $link .= "limit=" . $paramsData['limit'] . "&";
+            }
+            /* Time period */
+            $link .= "timeFilter=" . $timeVal . "&";
+        }
+        
+        $link = rtrim(rtrim($link, "&"), "?");
+        return $link;
+    }
+
+    /**
+     * Return history URL for Filter
+     *
+     * @return string
+     */
+    public function getHistoryPageURL()
+    {
+        $subscriptionId = $this->getRequest()->getParam('subscription_id');
+        return $this->_urlBuilder->getUrl(
+            'worldpay/recurring_order/view/',
+            ['_secure' => true, 'subscription_id' => $subscriptionId]
+        );
+    }
+    /**
+     * Return Selected Option in Filter
+     *
+     * @param string $filter
+     * @return bool
+     */
+    public function checkSelectedFilter($filter)
+    {
+        $selectedFilter = $this->getRequest()->getParam('timeFilter');
+        if ($filter == $selectedFilter) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Return cancel Url
+     *
+     * @param SubscriptionOrder $subscription
+     * @return string
+     */
+    public function getCancelUrl(SubscriptionOrder $subscription)
+    {
+        return $this->getUrl(
+            'worldpay/recurring_order/cancel/',
+            [
+                'id' => $subscription->getOriginalOrderId(),
+                '_secure' => true
+            ]
+        );
+    }
+
+    /**
+     * Return View Url
+     *
+     * @param SubscriptionOrder $subscription
+     * @return string
+     */
+    public function getViewlUrl(SubscriptionOrder $subscription)
+    {
+        return $this->getUrl(
+            'sales/order/view',
+            [
+                'order_id' => $subscription->getOriginalOrderId(),
+                '_secure' => true
+            ]
+        );
+    }
+    /**
+     * Return Skip Orderl Url
+     *
+     * @return string
+     */
+    public function getSkipOrderlUrl()
+    {
+        $subscriptionId = $this->getRequest()->getParam('subscription_id');
+        return $this->_urlBuilder->getUrl(
+            'worldpay/recurring_order/skiporders/',
+            ['_secure' => true, 'subscription_id' => $subscriptionId]
+        );
+    }
+    /**
+     * Check Order Shipment
+     *
+     * @param Subscription $subscription
+     * @return bool
+     */
+    public function checkOrderShipment(SubscriptionOrder $subscription)
+    {
+        $orderId = $subscription->getOriginalOrderId();
+        $order = $this->subscriptionOrder->getOrderbyOriginalId($orderId);
+
+        return $order->hasShipments();
+    }
+
+    /**
+     * Check Order Buffer Time
+     *
+     * @param Subscription $subscription
+     * @return bool
+     */
+    public function checkOrderBufferTime(SubscriptionOrder $subscription)
+    {
+        $createdAt = new \DateTime($subscription->getCreatedAt());
+        $current = new \DateTime();
+        $dateDiff = strtotime($current->format('Y-m-d')) - strtotime($createdAt->format('Y-m-d'));
+        $remainigDays = floor($dateDiff/(60*60*24));
+        $bufferTime = $this->recurringhelper->getRecurringOrderBufferTime();
+
+        return ($bufferTime >= $remainigDays) ? true : false;
+    }
+
+    /**
+     * Check Order already Canceled
+     *
+     * @param Subscription $subscription
+     * @return bool
+     */
+    public function getNotAlreadyCanceled(SubscriptionOrder $subscription)
+    {
+        $orderId = $subscription->getOriginalOrderId();
+        $order = $this->subscriptionOrder->getOrderbyOriginalId($orderId);
+
+        return ($order->getStatus() == 'canceled') ? true : false;
+    }
+
+    /**
+     * Get order id column value
+     *
+     * @param Subscription $subscription
+     * @return string
+     */
+    public function getOrderIdLabel($subscription)
+    {
+        $OrderIncrementId = '';
+        if ($subscription->getOriginalOrderId()) {
+            $OrderIncrementId = $this->getOrgIncrementOrderId($subscription->getOriginalOrderId());
+            return sprintf(
+                '<a href="%s" class="order-link"><span>%s</span></a>',
+                $this->getUrl('sales/order/view', ['order_id' => $subscription->getOriginalOrderId()]),
+                $this->escapeHtml($OrderIncrementId)
+            );
+        }
+        return $this->escapeHtml($OrderIncrementId);
+    }
+
+    /**
+     * Retrieve OrgIncrement Order Id
+     *
+     * @param string $orderId
+     * @return string
+     */
+    public function getOrgIncrementOrderId($orderId)
+    {
+        $order = $this->orderRepository->get($orderId);
+        return $order->getIncrementId();
+    }
+    /**
+     * Prepare layout (initialise pagination block)
+     *
+     * @return $this
+     */
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        $this->pageConfig->getTitle()->set('All Recurring Order');
+
+        $pagination = $this->getLayout()
+            ->createBlock(
+                \Magento\Theme\Block\Html\Pager::class,
+                'subscriptions_order_pagination'
+            )
+            ->setCollection($this->getsubscriptionOrderCollection())
+            ->setPath('worldpay/recurring_order/view');
+        $this->setChild('pagination', $pagination);
+        return $this;
+    }
+    /**
+     * Show Pagination Html
+     *
+     * @return string
+     */
+    public function getPaginationHtml()
+    {
+        return $this->getChildHtml('pagination');
+    }
+}
diff --git a/Block/SubscriptionSkipOrders.php b/Block/SubscriptionSkipOrders.php
new file mode 100644
index 0000000..da6fbac
--- /dev/null
+++ b/Block/SubscriptionSkipOrders.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * Copyright © 2023 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+namespace Sapient\Worldpay\Block;
+
+use Sapient\Worldpay\Model\SkipSubscriptionOrder;
+
+class SubscriptionSkipOrders extends \Magento\Framework\View\Element\Template
+{
+    /**
+     * @var skipSubscriptionOrder
+     */
+    protected $skipSubscriptionOrder;
+
+    /**
+     * @var \Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder\Collection
+     */
+    private $subscriptionOrderCollection;
+
+    /**
+     * @var $orderRepository
+     */
+    protected $orderRepository;
+
+    /**
+     * @var \Magento\Framework\UrlInterface $urlInterface
+     */
+    protected $urlInterface;
+    /**
+     * Subscriptions block constructor.
+     *
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param SkipSubscriptionOrder $skipSubscriptionOrder
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Sapient\Worldpay\Helper\Recurring $recurringhelper
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Magento\Framework\UrlInterface $urlInterface
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        SkipSubscriptionOrder $skipSubscriptionOrder,
+        \Magento\Customer\Model\Session $customerSession,
+        \Sapient\Worldpay\Helper\Recurring $recurringhelper,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Magento\Framework\UrlInterface $urlInterface,
+        array $data = []
+    ) {
+        $this->skipSubscriptionOrder = $skipSubscriptionOrder;
+        $this->recurringhelper = $recurringhelper;
+        $this->orderRepository = $orderRepository;
+        $this->urlInterface = $urlInterface;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Retrieve Subscription Order Collection
+     *
+     * @return mixed
+     */
+    public function getskipSubscriptionOrderCollection()
+    {
+        $subscriptionId = $this->getRequest()->getParam('subscription_id');
+        $timeFilter = $this->getRequest()->getParam('timeFilter');
+        $timeFilterby = $this->skipSubscriptionOrder
+            ->getFilterDate($timeFilter=null);
+        $subscriptionOrderCollection = $this->skipSubscriptionOrder
+            ->getskipSubscriptionOrderCollection($subscriptionId, $timeFilterby);
+        
+        return $subscriptionOrderCollection;
+    }
+
+    /**
+     * My Account Labels
+     *
+     * @param string $labelCode
+     * @return $this
+     */
+
+    public function getMyAccountLabels($labelCode)
+    {
+        return $this->recurringhelper->getAccountLabelbyCode($labelCode);
+    }
+
+    /**
+     * Get subscription plan interval label
+     *
+     * @param string $interval
+     * @return string
+     */
+    public function getSubscriptionIntervalLabel($interval)
+    {
+        return $this->recurringhelper->getPlanIntervalLabel($interval);
+    }
+    
+    /**
+     * Specific Exception
+     *
+     * @param string $exceptioncode
+     * @return string
+     */
+
+    public function getMyAccountSpecificException($exceptioncode)
+    {
+        return $this->recurringhelper->getMyAccountExceptions($exceptioncode);
+    }
+    
+    /**
+     * Return Current Url
+     *
+     * @return string
+     */
+    public function getCurrentURL()
+    {
+        return $this->urlInterface->getCurrentUrl();
+    }
+  
+    /**
+     * Return  Order Filter URL
+     *
+     * @param string $timeVal
+     * @return string
+     */
+    public function getOrderFilterURL($timeVal)
+    {
+        $link = $this->getHistoryPageURL();
+        $paramsData = $this->getRequest()->getParams();
+        if (count($paramsData)) {
+            $link .= "?";
+            /* Page Number */
+            if (isset($paramsData['p'])) {
+                $link .= "p=" . $paramsData['p'] . "&";
+            }
+            /* Page Limit Number */
+            if (isset($paramsData['limit'])) {
+                $link .= "limit=" . $paramsData['limit'] . "&";
+            }
+            /* Time period */
+            $link .= "timeFilter=" . $timeVal . "&";
+        }
+        
+        $link = rtrim(rtrim($link, "&"), "?");
+        return $link;
+    }
+
+    /**
+     * Return history URL for Filter
+     *
+     * @return string
+     */
+    public function getHistoryPageURL()
+    {
+        $subscriptionId = $this->getRequest()->getParam('subscription_id');
+        return $this->_urlBuilder->getUrl(
+            'worldpay/recurring_order/skiporders/',
+            ['_secure' => true, 'subscription_id' => $subscriptionId]
+        );
+    }
+    /**
+     * Return Selected Option in Filter
+     *
+     * @param string $filter
+     * @return bool
+     */
+    public function checkSelectedFilter($filter)
+    {
+        $selectedFilter = $this->getRequest()->getParam('timeFilter');
+        if ($filter == $selectedFilter) {
+            return true;
+        }
+        return false;
+    }
+    
+    /**
+     * Return Complete Orderl Url
+     *
+     * @return string
+     */
+    public function getCompleteOrderlUrl()
+    {
+        $subscriptionId = $this->getRequest()->getParam('subscription_id');
+        return $this->_urlBuilder->getUrl(
+            'worldpay/recurring_order/view/',
+            ['_secure' => true, 'subscription_id' => $subscriptionId]
+        );
+    }
+
+    /**
+     * Check Order Shipment
+     *
+     * @param Subscription $subscription
+     * @return bool
+     */
+    public function checkOrderShipment(SubscriptionOrder $subscription)
+    {
+        $orderId = $subscription->getOriginalOrderId();
+        $order = $this->skipSubscriptionOrder->getOrderbyOriginalId($orderId);
+
+        return $order->hasShipments();
+    }
+
+    /**
+     * Check Order Buffer Time
+     *
+     * @param Subscription $subscription
+     * @return bool
+     */
+    public function checkOrderBufferTime(SubscriptionOrder $subscription)
+    {
+        $createdAt = new \DateTime($subscription->getCreatedAt());
+        $current = new \DateTime();
+        $dateDiff = strtotime($current->format('Y-m-d')) - strtotime($createdAt->format('Y-m-d'));
+        $remainigDays = floor($dateDiff/(60*60*24));
+        $bufferTime = $this->recurringhelper->getRecurringOrderBufferTime();
+
+        return ($bufferTime >= $remainigDays) ? true : false;
+    }
+
+    /**
+     * Check Order already Canceled
+     *
+     * @param Subscription $subscription
+     * @return bool
+     */
+    public function getNotAlreadyCanceled(SubscriptionOrder $subscription)
+    {
+        $orderId = $subscription->getOriginalOrderId();
+        $order = $this->skipSubscriptionOrder->getOrderbyOriginalId($orderId);
+
+        return ($order->getStatus() == 'canceled') ? true : false;
+    }
+
+    /**
+     * Get order id column value
+     *
+     * @param Subscription $subscription
+     * @return string
+     */
+    public function getOrderIdLabel($subscription)
+    {
+        $OrderIncrementId = '';
+        if ($subscription->getOriginalOrderId()) {
+            $OrderIncrementId = $this->getOrgIncrementOrderId($subscription->getOriginalOrderId());
+            return sprintf(
+                '<a href="%s" class="order-link"><span>%s</span></a>',
+                $this->getUrl('sales/order/view', ['order_id' => $subscription->getOriginalOrderId()]),
+                $this->escapeHtml($OrderIncrementId)
+            );
+        }
+        return $this->escapeHtml($OrderIncrementId);
+    }
+
+    /**
+     * Retrieve OrgIncrement Order Id
+     *
+     * @param string $orderId
+     * @return string
+     */
+    public function getOrgIncrementOrderId($orderId)
+    {
+        $order = $this->orderRepository->get($orderId);
+        return $order->getIncrementId();
+    }
+    /**
+     * Prepare layout (initialise pagination block)
+     *
+     * @return $this
+     */
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        $this->pageConfig->getTitle()->set('All Recurring Order');
+
+        $pagination = $this->getLayout()
+            ->createBlock(
+                \Magento\Theme\Block\Html\Pager::class,
+                'subscriptions_order_pagination'
+            )
+            ->setCollection($this->getskipSubscriptionOrderCollection())
+            ->setPath('worldpay/recurring_order/skiporders');
+        $this->setChild('pagination', $pagination);
+        return $this;
+    }
+    /**
+     * Show Pagination Html
+     *
+     * @return string
+     */
+    public function getPaginationHtml()
+    {
+        return $this->getChildHtml('pagination');
+    }
+}
diff --git a/Controller/Adminhtml/Recurring/Plan/Save.php b/Controller/Adminhtml/Recurring/Plan/Save.php
index 816875b..199f557 100644
--- a/Controller/Adminhtml/Recurring/Plan/Save.php
+++ b/Controller/Adminhtml/Recurring/Plan/Save.php
@@ -33,6 +33,11 @@ class Save extends \Sapient\Worldpay\Controller\Adminhtml\Recurring\Plan
      */
     private $uri;
 
+    /**
+     * @var RedirectInterface
+     */
+    protected $redirect;
+
     /**
      * Constructor
      *
@@ -43,6 +48,7 @@ class Save extends \Sapient\Worldpay\Controller\Adminhtml\Recurring\Plan
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Sapient\Worldpay\Helper\GeneralException $helper
      * @param \Laminas\Uri\Uri $uri
+     * @param \Magento\Framework\App\Response\RedirectInterface $redirect
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -51,7 +57,8 @@ public function __construct(
         \Magento\Framework\Locale\FormatInterface $localeFormat,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Sapient\Worldpay\Helper\GeneralException $helper,
-        \Laminas\Uri\Uri $uri
+        \Laminas\Uri\Uri $uri,
+        \Magento\Framework\App\Response\RedirectInterface $redirect
     ) {
         parent::__construct($context, $planFactory);
         $this->planGridDataProvider = $planGridDataProvider;
@@ -59,6 +66,7 @@ public function __construct(
         $this->helper = $helper;
         $this->storeManager = $storeManager;
         $this->uri = $uri;
+        $this->redirect = $redirect;
     }
 
     /**
@@ -71,8 +79,8 @@ public function execute()
         $data = $this->getRequest()->getPostValue();
         //$productId = $this->getRequest()->getParam('product_id');
 
-        //$url = parse_url($this->_redirect->getRefererUrl());
-        $parsedUrl = $this->uri->parse($this->_redirect->getRefererUrl());
+        //$url = parse_url($this->redirect->getRefererUrl());
+        $parsedUrl = $this->uri->parse($this->redirect->getRefererUrl());
         $path_parts=explode('/', $parsedUrl->getPath());
         if (in_array('id', $path_parts)) {
             $key = array_search('id', $path_parts);
diff --git a/Controller/Paybylink/Multishipping/Orderplaced.php b/Controller/Paybylink/Multishipping/Orderplaced.php
index fce0112..ad175ec 100644
--- a/Controller/Paybylink/Multishipping/Orderplaced.php
+++ b/Controller/Paybylink/Multishipping/Orderplaced.php
@@ -10,6 +10,7 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
+use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
 /**
@@ -27,18 +28,26 @@ class Orderplaced extends Action implements HttpGetActionInterface
      */
     private $multishipping;
 
+    /**
+     * @var $resultPageFactory
+     */
+    protected $resultPageFactory;
+
     /**
      * @param Context $context
      * @param State $state
      * @param Multishipping $multishipping
+     * @param PageFactory $resultPageFactory
      */
     public function __construct(
         Context $context,
         State $state,
-        Multishipping $multishipping
+        Multishipping $multishipping,
+        PageFactory $resultPageFactory
     ) {
         $this->state = $state;
         $this->multishipping = $multishipping;
+        $this->resultPageFactory = $resultPageFactory;
         parent::__construct($context);
     }
     /**
@@ -51,9 +60,10 @@ public function execute()
         if (!$this->state->getCompleteStep(State::STEP_OVERVIEW)) {
             return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
-        $this->_view->loadLayout();
+        $resultPage = $this->resultPageFactory->create();
         $ids = $this->multishipping->getOrderIds();
         $this->_eventManager->dispatch('multishipping_checkout_controller_success_action', ['order_ids' => $ids]);
-        $this->_view->renderLayout();
+        
+        return $resultPage;
     }
 }
diff --git a/Controller/Paybylink/Multishipping/Success.php b/Controller/Paybylink/Multishipping/Success.php
index 5d38ea1..29fa60c 100644
--- a/Controller/Paybylink/Multishipping/Success.php
+++ b/Controller/Paybylink/Multishipping/Success.php
@@ -10,6 +10,7 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
+use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
 /**
@@ -38,6 +39,11 @@ class Success extends Action implements HttpGetActionInterface
      * @var \Magento\Quote\Api\CartRepositoryInterface
      */
     private $quoteRepository;
+    
+    /**
+     * @var $resultPageFactory
+     */
+    protected $resultPageFactory;
 
     /**
      * @param Context $context
@@ -46,6 +52,7 @@ class Success extends Action implements HttpGetActionInterface
      * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
      * @param \Sapient\Worldpay\Model\ResourceModel\Multishipping\Order\Collection $wpMultishippingCollection
      * @param \Magento\Sales\Model\Order $order
+     * @param PageFactory $resultPageFactory
      */
     public function __construct(
         Context $context,
@@ -53,13 +60,15 @@ public function __construct(
         Multishipping $multishipping,
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
         \Sapient\Worldpay\Model\ResourceModel\Multishipping\Order\Collection $wpMultishippingCollection,
-        \Magento\Sales\Model\Order $order
+        \Magento\Sales\Model\Order $order,
+        PageFactory $resultPageFactory
     ) {
         $this->state = $state;
         $this->multishipping = $multishipping;
         $this->order = $order;
         $this->wpMultishippingCollection = $wpMultishippingCollection;
         $this->quoteRepository = $quoteRepository;
+        $this->resultPageFactory = $resultPageFactory;
         parent::__construct($context);
     }
     /**
@@ -84,11 +93,10 @@ public function execute()
                 $this->messageManager->addNotice("Multishipping orders not found");
                 return $this->resultRedirectFactory->create()->setPath('checkout/cart', ['_current' => true]);
             }
-            $this->_view->loadLayout();
+            $resultPage = $this->resultPageFactory->create();
             $ids = $multiShippingOrders;
             $this->_eventManager->dispatch('multishipping_checkout_controller_success_action', ['order_ids' => $ids]);
-            $this->_view->renderLayout();
-            return;
+            return $resultPage;
         }
         $this->messageManager->addNotice("Order not found");
         return $this->resultRedirectFactory->create()->setPath('checkout/cart', ['_current' => true]);
diff --git a/Controller/Payment/Pay.php b/Controller/Payment/Pay.php
index 589bf29..08aec80 100644
--- a/Controller/Payment/Pay.php
+++ b/Controller/Payment/Pay.php
@@ -166,7 +166,7 @@ public function execute()
 
         $this->jsonGenerator($paymentManifestJson, self::PAYMENT_MANIFEST_JSON);
         $this->jsonGenerator($paymentAppManifestjson, self::MANIFEST_JSON);
-        $result->setContents('');
+        $result->setContents('Pay with Chromepay');
         $result->setHeader('link', '<'.$mediPathPaymentManifest.'>; rel="payment-method-manifest"');
         return $result;
     }
diff --git a/Controller/Recurring/Edit.php b/Controller/Recurring/Edit.php
index f016b03..b28e2e7 100644
--- a/Controller/Recurring/Edit.php
+++ b/Controller/Recurring/Edit.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2020 Worldpay, LLC. All rights reserved.
+ * Copyright ©2020 Worldpay, LLC. All rights reserved.
  * See LICENSE.txt for license details.
  */
 
@@ -13,26 +13,27 @@
 use Sapient\Worldpay\Model\Recurring\SubscriptionFactory;
 use Sapient\Worldpay\Model\Config\Source\SubscriptionStatus;
 use Sapient\Worldpay\Helper\GeneralException;
+use Magento\Framework\Registry;
 
 class Edit extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var Session
+     * @var $customerSession
      */
     private $customerSession;
 
     /**
-     * @var PageFactory
+     * @var $resultPageFactory
      */
     private $resultPageFactory;
 
     /**
-     * @var SubscriptionFactory
+     * @var $subscriptionFactory
      */
     private $subscriptionFactory;
 
     /**
-     * @var helper
+     * @var $helper
      */
     private $helper;
 
@@ -41,6 +42,11 @@ class Edit extends \Magento\Framework\App\Action\Action
      */
     private $customerUrl;
 
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    private $registry;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -48,6 +54,7 @@ class Edit extends \Magento\Framework\App\Action\Action
      * @param SubscriptionFactory $subscriptionFactory
      * @param Sapient\Worldpay\Helper\GeneralException $helper
      * @param \Magento\Customer\Model\Url $customerUrl
+     * @param Registry $registry
      */
     public function __construct(
         Context $context,
@@ -55,7 +62,8 @@ public function __construct(
         PageFactory $resultPageFactory,
         SubscriptionFactory $subscriptionFactory,
         \Sapient\Worldpay\Helper\GeneralException $helper,
-        \Magento\Customer\Model\Url $customerUrl
+        \Magento\Customer\Model\Url $customerUrl,
+        Registry $registry
     ) {
         $this->customerSession = $customerSession;
         parent::__construct($context);
@@ -63,6 +71,7 @@ public function __construct(
         $this->subscriptionFactory = $subscriptionFactory;
         $this->helper = $helper;
         $this->customerUrl = $customerUrl;
+        $this->registry = $registry;
     }
 
     /**
@@ -113,6 +122,8 @@ public function execute()
             return $this->resultRedirectFactory->create()->setPath('*/*');
         }
 
+        $this->registry->register('current_subscription_order', $subscription);
+
         /** @var \Magento\Framework\View\Element\Html\Links $navigationBlock */
         //$resultPage->getConfig()->getTitle()->set(__('Update Saved Card'));
         $navigationBlock = $resultPage->getLayout()->getBlock('customer_account_navigation');
diff --git a/Controller/Recurring/Order/Cancel.php b/Controller/Recurring/Order/Cancel.php
new file mode 100644
index 0000000..948440b
--- /dev/null
+++ b/Controller/Recurring/Order/Cancel.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © 2020 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+
+namespace Sapient\Worldpay\Controller\Recurring\Order;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
+use Sapient\Worldpay\Model\SubscriptionOrder;
+use Sapient\Worldpay\Model\Recurring\SubscriptionFactory;
+use Sapient\Worldpay\Helper\MyAccountException;
+
+class Cancel extends \Magento\Framework\App\Action\Action
+{
+    /**
+     * @var Session
+     */
+    private $customerSession;
+
+    /**
+     * @var \Magento\Customer\Model\Url
+     */
+
+    private $customerUrl;
+    /**
+     * @var SubscriptionOrder
+     */
+    protected $subscriptionOrder;
+
+    /**
+     * @var SubscriptionFactory
+     */
+    private $subscriptionFactory;
+    
+    /**
+     * @var MyAccountException
+     */
+
+      private $exceptionhelper;
+
+    /**
+     * @param Context $context
+     * @param Session $customerSession
+     * @param \Magento\Customer\Model\Url $customerUrl
+     * @param SubscriptionOrder $subscriptionOrder
+     * @param SubscriptionFactory $subscriptionFactory
+     * @param MyAccountException $exceptionhelper
+     */
+    public function __construct(
+        Context $context,
+        Session $customerSession,
+        \Magento\Customer\Model\Url $customerUrl,
+        SubscriptionOrder $subscriptionOrder,
+        SubscriptionFactory $subscriptionFactory,
+        MyAccountException $exceptionhelper
+    ) {
+        parent::__construct($context);
+        $this->customerSession = $customerSession;
+        $this->exceptionhelper = $exceptionhelper;
+        $this->customerUrl = $customerUrl;
+        $this->subscriptionOrder = $subscriptionOrder;
+        $this->subscriptionFactory = $subscriptionFactory;
+    }
+
+    /**
+     * Check customer authentication
+     *
+     * @param RequestInterface $request
+     * @return \Magento\Framework\App\ResponseInterface
+     */
+    public function dispatch(RequestInterface $request)
+    {
+        $loginUrl = $this->customerUrl->getLoginUrl();
+        if (!$this->customerSession->authenticate($loginUrl)) {
+            $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
+        }
+        return parent::dispatch($request);
+    }
+
+    /**
+     * Execute
+     *
+     * @return \Magento\Framework\Controller\ResultInterface|ResponseInterface
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
+    public function execute()
+    {
+        $redirectResult = $this->resultRedirectFactory->create();
+        $orderId = $this->getRequest()->getParam('id');
+        $order = $this->subscriptionOrder->getOrderbyOriginalId($orderId);
+        $subscription = $this->subscriptionFactory
+                        ->create()
+                        ->load($order->getWorldpaySubscriptionId());
+        if ($subscription->getCustomerId() != $this->customerSession->getCustomerId()) {
+            $redirectResult->setPath('noroute');
+            $this->messageManager
+                ->addErrorMessage(__('Order not found.'));
+            return $redirectResult;
+        }
+        try {
+            $order->cancel()->save();
+            $redirectResult->setPath(
+                'sales/order/view/order_id/'.$orderId,
+                ['_secure' => true]
+            );
+                $this->messageManager
+                    ->addSuccessMessage(__($this->exceptionhelper->getConfigValue('MCAM14')));
+        } catch (\Exception $e) {
+            $redirectResult->setPath(
+                'worldpay/recurring_order/'.$subscription->getSubscriptionId(),
+                ['_secure' => true]
+            );
+            $this->messageManager->addErrorMessage(__($this->exceptionhelper->getConfigValue('MCAM18')));
+        }
+        return $redirectResult;
+    }
+}
diff --git a/Controller/Recurring/Order/Skiporders.php b/Controller/Recurring/Order/Skiporders.php
new file mode 100644
index 0000000..1d920aa
--- /dev/null
+++ b/Controller/Recurring/Order/Skiporders.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © 2023 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+namespace Sapient\Worldpay\Controller\Recurring\Order;
+
+use Sapient\Worldpay\Model\ResourceModel\SkipSubscriptionOrderFactory;
+
+class Skiporders extends \Magento\Framework\App\Action\Action
+{
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    protected $resultPageFactory;
+
+    /**
+     * @var $SubscriptionOrderFactory
+     */
+    private $skipSubscriptionOrderFactory;
+        
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    protected $customerSession;
+
+    /**
+     * @var \Sapient\Worldpay\Helper\Data
+     */
+    private $worldpayhelper;
+
+    /**
+     * Constructor
+     *
+     * @param Context $context
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param SkipSubscriptionOrderFactory $skipSubscriptionOrderFactory
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Sapient\Worldpay\Helper\Data $worldpayhelper
+     */
+
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        SkipSubscriptionOrderFactory $skipSubscriptionOrderFactory,
+        \Magento\Customer\Model\Session $customerSession,
+        \Sapient\Worldpay\Helper\Data $worldpayhelper
+    ) {
+        parent::__construct($context);
+        $this->resultPageFactory = $resultPageFactory;
+        $this->skipSubscriptionOrderFactory = $skipSubscriptionOrderFactory;
+        $this->customerSession = $customerSession;
+        $this->worldpayhelper = $worldpayhelper;
+    }
+
+    /**
+     * Excute and redirect on result page
+     */
+    public function execute()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        if (!$this->customerSession->isLoggedIn()) {
+            $resultRedirect->setPath('customer/account/login');
+            return $resultRedirect;
+        }
+        return $this->resultPageFactory->create();
+    }
+}
diff --git a/Controller/Recurring/Order/View.php b/Controller/Recurring/Order/View.php
new file mode 100644
index 0000000..5e51feb
--- /dev/null
+++ b/Controller/Recurring/Order/View.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © 2023 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+namespace Sapient\Worldpay\Controller\Recurring\Order;
+
+use Sapient\Worldpay\Model\ResourceModel\SubscriptionOrderFactory;
+
+class View extends \Magento\Framework\App\Action\Action
+{
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    protected $resultPageFactory;
+
+    /**
+     * @var $SubscriptionOrderFactory
+     */
+    private $SubscriptionOrderFactory;
+        
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    protected $customerSession;
+
+    /**
+     * Constructor
+     *
+     * @param Context $context
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param SubscriptionOrderFactory $SubscriptionOrderFactory
+     * @param \Magento\Customer\Model\Session $customerSession
+     */
+
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        SubscriptionOrderFactory $SubscriptionOrderFactory,
+        \Magento\Customer\Model\Session $customerSession
+    ) {
+        parent::__construct($context);
+        $this->resultPageFactory = $resultPageFactory;
+        $this->SubscriptionOrderFactory = $SubscriptionOrderFactory;
+        $this->customerSession = $customerSession;
+    }
+
+    /**
+     * Excute and redirect on result page
+     */
+    public function execute()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        if (!$this->customerSession->isLoggedIn()) {
+            $resultRedirect->setPath('customer/account/login');
+            return $resultRedirect;
+        }
+        return $this->resultPageFactory->create();
+    }
+}
diff --git a/Controller/Redirectresult/Redirect.php b/Controller/Redirectresult/Redirect.php
index 03724e0..32608ca 100644
--- a/Controller/Redirectresult/Redirect.php
+++ b/Controller/Redirectresult/Redirect.php
@@ -64,7 +64,7 @@ public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
         if (!$this->worldpayHelper->isWorldPayEnable()) {
-           $resultRedirect->setPath('noroute');
+            $resultRedirect->setPath('noroute');
             return $resultRedirect;
         }
         $redirecturl = $this->checkoutsession->getWpRedirecturl();
diff --git a/Controller/Samsungpay/CallBack.php b/Controller/Samsungpay/CallBack.php
index 5a39353..9e63824 100644
--- a/Controller/Samsungpay/CallBack.php
+++ b/Controller/Samsungpay/CallBack.php
@@ -1,6 +1,5 @@
 <?php
 
-//error_reporting(0);
 /**
  * @copyright 2017 Sapient
  */
@@ -157,7 +156,7 @@ public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
         if (!$this->worldpayHelper->isWorldPayEnable()) {
-           $resultRedirect->setPath('noroute');
+            $resultRedirect->setPath('noroute');
             return $resultRedirect;
         }
         $order = $this->_checkoutSession->getLastRealOrder();
diff --git a/Controller/Samsungpay/Index.php b/Controller/Samsungpay/Index.php
index dc46a2e..e34536c 100644
--- a/Controller/Samsungpay/Index.php
+++ b/Controller/Samsungpay/Index.php
@@ -1,5 +1,5 @@
 <?php
-//error_reporting(0);
+
 /**
  * @copyright 2017 Sapient
  */
@@ -119,7 +119,7 @@ public function execute()
         if (!$this->worldpayHelper->isWorldPayEnable()) {
             $resultRedirect->setPath('noroute');
              return $resultRedirect;
-         }
+        }
         $storeScope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
         
         $serviceId = $this->scopeConfig->
diff --git a/Controller/Skiporder/Index.php b/Controller/Skiporder/Index.php
new file mode 100644
index 0000000..ea51a53
--- /dev/null
+++ b/Controller/Skiporder/Index.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © 2023 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+namespace Sapient\Worldpay\Controller\Skiporder;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Sapient\Worldpay\Model\ResourceModel\SkipSubscriptionOrder\CollectionFactory;
+use Sapient\Worldpay\Model\SkipSubscriptionOrderFactory;
+use Sapient\Worldpay\Model\SkipSubscriptionOrderRepository;
+
+class Index extends \Magento\Framework\App\Action\Action
+{
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    private $customerSession;
+
+    /**
+     * @var \Sapient\Worldpay\Helper\Data
+     */
+    private $worldpayhelper;
+
+    /**
+     * @var \Magento\Customer\Model\Url
+     */
+    private $customerUrl;
+
+    /**
+     * @var $skipOrderRepository
+     */
+    private $skipOrderRepository;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Sapient\Worldpay\Helper\Data $worldpayhelper
+     * @param \Magento\Customer\Model\Url $customerUrl
+     * @param SkipSubscriptionOrderRepository $skipOrderRepository
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Customer\Model\Session $customerSession,
+        \Sapient\Worldpay\Helper\Data $worldpayhelper,
+        \Magento\Customer\Model\Url $customerUrl,
+        SkipSubscriptionOrderRepository $skipOrderRepository
+    ) {
+        $this->customerSession = $customerSession;
+        $this->worldpayhelper = $worldpayhelper;
+        $this->customerUrl = $customerUrl;
+        $this->skipOrderRepository = $skipOrderRepository;
+        parent::__construct($context);
+    }
+
+    /**
+     * Check customer authentication
+     *
+     * @param RequestInterface $request
+     * @return \Magento\Framework\App\ResponseInterface
+     */
+    public function dispatch(RequestInterface $request)
+    {
+        $loginUrl = $this->customerUrl->getLoginUrl();
+        if (!$this->customerSession->authenticate($loginUrl)) {
+            $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
+        }
+        return parent::dispatch($request);
+    }
+
+    /**
+     * Display subscriptions bought by customer
+     *
+     * @return void
+     */
+    public function execute()
+    {
+        if ($this->getRequest()->isAjax()) {
+            $params = $this->getRequest()->getParams('subscriptionId');
+            $isSkipped = $this->skipOrderRepository->updateSkipHistory($params);
+            $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+            if ($isSkipped) {
+                $this->messageManager->addSuccess("Order skipped successfully");
+                $resultJson->setData(["message" => ("Order skipped successfully"), "suceess" => true]);
+            } else {
+                $this->messageManager
+                    ->addNoticeMessage("Someting went wrong. Please try again later.");
+                $resultJson->setData(["message" => ("Order skipped successfully"), "suceess" => false]);
+            }
+            return $resultJson;
+        }
+          $resultRedirect = $this->resultRedirectFactory->create();
+          $resultRedirect->setPath('404notfound');
+          return $resultRedirect;
+    }
+}
diff --git a/Cron/RecurringOrdersEmail.php b/Cron/RecurringOrdersEmail.php
new file mode 100644
index 0000000..3d482f0
--- /dev/null
+++ b/Cron/RecurringOrdersEmail.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Cron;
+
+use \Magento\Framework\App\ObjectManager;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Exception;
+
+/**
+ * Model for order sync status based on configuration set by admin
+ */
+class RecurringOrdersEmail
+{
+    public const EMAIL_NOTIFICATION_DAYS = 9;
+    /**
+     * @var \Sapient\Worldpay\Logger\WorldpayLogger
+     */
+    protected $_logger;
+   
+    /**
+     * @var CollectionFactory
+     */
+    private $subscriptionCollectionFactory;
+    
+    /**
+     * @var CollectionFactory
+     */
+    private $transactionCollectionFactory;
+
+    /**
+     * @var \Sapient\Worldpay\Helper\SendRecurringOrdersEmail
+     */
+    protected $recurringOrdersEmail;
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $_storeManager;
+    /**
+     * @var \Sapient\Worldpay\Model\SavedToken
+     */
+    protected $worldpaytoken;
+    /**
+     * @var \Sapient\Worldpay\Helper\Recurring
+     */
+    protected $recurringhelper;
+    /**
+     * @var \Sapient\Worldpay\Model\Recurring\PlanFactory
+     */
+    protected $planFactory;
+    /**
+     * Constructor
+     *
+     * @param \Sapient\Worldpay\Logger\WorldpayLogger $wplogger
+     * @param \Sapient\Worldpay\Model\Recurring\Subscription $subscriptions
+     * @param \Sapient\Worldpay\Model\Recurring\Subscription\Transactions $recurringTransactions
+     * @param \Sapient\Worldpay\Helper\SendRecurringOrdersEmail $recurringOrdersEmail
+     * @param \Magento\Store\Model\StoreManagerInterface $_storeManager
+     * @param \Sapient\Worldpay\Model\Token\WorldpayToken $worldpaytoken
+     * @param \Sapient\Worldpay\Helper\Recurring $recurringhelper
+     * @param \Sapient\Worldpay\Model\Recurring\PlanFactory $planFactory
+     */
+    public function __construct(
+        \Sapient\Worldpay\Logger\WorldpayLogger $wplogger,
+        \Sapient\Worldpay\Model\Recurring\Subscription $subscriptions,
+        \Sapient\Worldpay\Model\Recurring\Subscription\Transactions $recurringTransactions,
+        \Sapient\Worldpay\Helper\SendRecurringOrdersEmail $recurringOrdersEmail,
+        \Magento\Store\Model\StoreManagerInterface $_storeManager,
+        \Sapient\Worldpay\Model\SavedToken $worldpaytoken,
+        \Sapient\Worldpay\Helper\Recurring $recurringhelper,
+        \Sapient\Worldpay\Model\Recurring\PlanFactory $planFactory
+    ) {
+        $this->_logger = $wplogger;
+        $this->subscriptionCollectionFactory = $subscriptions;
+        $this->transactionCollectionFactory = $recurringTransactions;
+        $this->recurringOrdersEmail = $recurringOrdersEmail;
+        $this->_storeManager = $_storeManager;
+        $this->worldpaytoken = $worldpaytoken;
+        $this->recurringhelper = $recurringhelper;
+        $this->planFactory = $planFactory;
+    }
+
+    /**
+     * Get the list of orders to be sync the status
+     */
+    public function execute()
+    {
+        $this->_logger->info('Recurring Orders Email Notificaion executed on - '.date('Y-m-d H:i:s'));
+        $recurringOrderIds = $this->getRecurringOrders();
+        if (!empty($recurringOrderIds)) {
+            foreach ($recurringOrderIds as $recurringOrder) {
+                $orderData = $paymentData = [];
+                $recurringOrderData = $recurringOrder;
+                $totalInfo = $this->getTotalDetails($recurringOrderData);
+                if ($totalInfo) {
+                    try {
+                        $subscriptionDetails = $totalInfo['subscriptionData'];
+                        $orderId = $subscriptionDetails->getOriginalOrderId();
+                        $interval = $this->getPlanInterval($subscriptionDetails->getPlanId());
+                        if (($interval) && ($interval != 'WEEKLY')) {
+                            $viewOrderUrl = $this->_storeManager->getStore()
+                                        ->getBaseUrl().'worldpay/recurring/edit/subscription_id/'.$subscriptionDetails
+                                        ->getSubscriptionId();
+                            $orderData = [
+                            'email'          => [$subscriptionDetails->getCustomerEmail()],
+                            'order_id'       => $subscriptionDetails->getOriginalOrderIncrementId(),
+                            'billing_name'   => $subscriptionDetails->getBillingName(),
+                            'recurring_date' => $recurringOrderData['recurring_date'],
+                            'product_name'   => $subscriptionDetails->getProductName(),
+                            'view_order_url' => $viewOrderUrl,
+                            'mail_template'  => $this->recurringhelper->getRecurringOrderReminderEmail(),
+                            'expired_msg'    => $this->getCartExpiryMessage($totalInfo),
+                            'order_data'     => $this->recurringhelper->getOrderDetails($orderId)
+                            ];
+                            $this->recurringOrdersEmail->sendRecurringOrdersEmail($orderData);
+                        }
+                    } catch (Exception $e) {
+                        $this->_logger->error($e->getMessage());
+                    }
+                }
+            }
+        }
+        return $this;
+    }
+    
+    /**
+     * Get the list of orders for send Email Notificaion
+     *
+     * @return array List of orders
+     */
+    public function getRecurringOrders()
+    {
+        $curdate = date("Y-m-d");
+        $days = $this->recurringhelper->getRecurringOrderBufferTime() + self::EMAIL_NOTIFICATION_DAYS;
+        $orderDate = strtotime(date("Y-m-d", strtotime($curdate)) . " +".$days." day");
+        $recurringDate = date('Y-m-d', $orderDate);
+        $result = $this->transactionCollectionFactory->getCollection()
+                ->addFieldToFilter('status', ['eq' => 'active'])
+                ->addFieldToFilter('recurring_date', ['eq' => $recurringDate])->getData();
+        return $result;
+    }
+
+    /**
+     * Get Total Details
+     *
+     * @param array $recurringOrderData
+     */
+    public function getTotalDetails($recurringOrderData)
+    {
+        $data = [];
+        if ($recurringOrderData) {
+            $tokenId = $recurringOrderData['worldpay_token_id'];
+            $data['tokenData'] = $this->getTokenInfo($tokenId, $recurringOrderData['customer_id']);
+            $data['subscriptionData'] = $this->getSubscriptionsInfo($recurringOrderData['subscription_id']);
+        }
+        return $data;
+    }
+    
+    /**
+     * Get Total Details
+     *
+     * @param Int $tokenId
+     * @param Int $customerId
+     */
+
+    public function getTokenInfo($tokenId, $customerId)
+    {
+        $curdate = date("Y-m-d");
+        if ($tokenId) {
+            $result = $this->worldpaytoken->getCollection()
+                ->addFieldToFilter('id', ['eq' => trim($tokenId)])
+                ->addFieldToFilter('customer_id', ['eq' => trim($customerId)])
+                ->addFieldToFilter('token_expiry_date', ['gteq' => $curdate])->getData();
+            return $result;
+        }
+    }
+    /**
+     * Get SubscriptionsInfo
+     *
+     * @param Int $subscriptionId
+     */
+    public function getSubscriptionsInfo($subscriptionId)
+    {
+        if ($subscriptionId) {
+            $collection = $this->subscriptionCollectionFactory->getCollection()
+                ->addFieldToFilter('subscription_id', ['eq' => trim($subscriptionId)]);
+            if ($collection->getSize()) {
+                return $collection->getFirstItem();
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Get Plan Interval
+     *
+     * @param Int $planId
+     */
+    public function getPlanInterval($planId)
+    {
+        if ($planId) {
+            $plan = $this->planFactory->create()->loadById($planId);
+            return $plan->getInterval();
+        }
+        return false;
+    }
+
+    /**
+     * Get Cart Expiry Message Interval
+     *
+     * @param array $totalInfo
+     */
+    public function getCartExpiryMessage($totalInfo)
+    {
+        $expiredMsg = '';
+        if (isset($totalInfo['tokenData'][0])) {
+            $currentDate = date("Y-m-d");
+            $currentMonth = date("m") + 1;
+            $currentYear = date("Y");
+
+            $expiryMonth = sprintf("%02d", $totalInfo['tokenData'][0]['card_expiry_month']);
+            $expiryYear = $totalInfo['tokenData'][0]['card_expiry_year'];
+            $expiry = date($expiryYear.'-'.$expiryMonth.'-01');
+
+            if ($expiry < $currentDate) {
+                $expiredMsg = 'Your card is expired. Plese add/update card details.';
+            } elseif ($expiryYear === $currentYear && $expiryMonth == $currentMonth) {
+                $expiredMsg = 'Your card is going to expire, please check the card or update the card details';
+            }
+        }
+        return $expiredMsg;
+    }
+}
diff --git a/Helper/Data.php b/Helper/Data.php
index 3082c2d..f6c484b 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -1230,6 +1230,20 @@ public function isSamsungPayEnable()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
+
+    /**
+     * Get Samsung Pay Button Type
+     *
+     * @return string
+     */
+    public function getSamsungPayButtonType()
+    {
+        return $this->_scopeConfig->getValue(
+            'worldpay/payment_method_logo_config/wallet/samsungpay_ssl/samsungpay_button_type',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
     /**
      * Get is Dynamic 3DS2 Enabled
      *
@@ -2785,11 +2799,11 @@ public function getCurrentMagentoVersionDetails()
     {
         $mageDetails = [];
         $mageDetails['platform'] = __('Magento');
-        if($this->productMetaData->getEdition()){
-           $mageDetails['edition'] = __('Magento_').$this->productMetaData->getEdition();
+        if ($this->productMetaData->getEdition()) {
+            $mageDetails['edition'] = __('Magento_').$this->productMetaData->getEdition();
         }
-        if($this->productMetaData->getVersion()){
-           $mageDetails['version'] = $this->productMetaData->getVersion();
+        if ($this->productMetaData->getVersion()) {
+            $mageDetails['version'] = $this->productMetaData->getVersion();
         }
         return $mageDetails;
     }
diff --git a/Helper/Recurring.php b/Helper/Recurring.php
index 97220a4..4241a7d 100644
--- a/Helper/Recurring.php
+++ b/Helper/Recurring.php
@@ -7,6 +7,7 @@
 
 use Sapient\Worldpay\Model\Config\Source\Interval;
 use Sapient\Worldpay\Model\Config\Source\TrialInterval;
+use Sapient\Worldpay\Model\Recurring\Subscription\Transactions;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
@@ -15,7 +16,8 @@
 class Recurring extends \Magento\Framework\App\Helper\AbstractHelper
 {
     public const PENDING_RECURRING_PAYMENT_ORDER_STATUS = 'pending_recurring_payment';
-
+    public const RECURRING_ORDER_SKIP_DAYS_UPTO = 9;
+    
     /**
      * Product type ids supported to act as subscriptions
      *
@@ -142,6 +144,21 @@ class Recurring extends \Magento\Framework\App\Helper\AbstractHelper
      * @var \Magento\Integration\Model\Oauth\TokenFactory
      */
     protected $_tokenModelFactory;
+
+    /**
+     * @var $orderRepository
+     */
+    protected $orderRepository;
+    /**
+     * @var \Magento\Customer\Model\Address\Config
+     */
+    protected $_addressConfig;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $transactionCollectionFactory;
+
     /**
      * Recurring constructor
      * @param \Magento\Framework\App\Helper\Context $context
@@ -166,6 +183,9 @@ class Recurring extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Integration\Model\Oauth\TokenFactory $tokenModelFactory
      * @param SerializerInterface $serializer
      * @param \Sapient\Worldpay\Helper\CurlHelper $curlHelper
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Magento\Customer\Model\Address\Config $addressConfig
+     * @param Transactions $recurringTransactions
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -189,7 +209,10 @@ public function __construct(
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Integration\Model\Oauth\TokenFactory $tokenModelFactory,
         SerializerInterface $serializer,
-        \Sapient\Worldpay\Helper\CurlHelper $curlHelper
+        \Sapient\Worldpay\Helper\CurlHelper $curlHelper,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Magento\Customer\Model\Address\Config $addressConfig,
+        Transactions $recurringTransactions
     ) {
         parent::__construct($context);
         $this->plansCollectionFactory = $plansCollectionFactory;
@@ -210,6 +233,9 @@ public function __construct(
         $this->_tokenModelFactory = $tokenModelFactory;
         $this->serializer = $serializer;
         $this->curlHelper = $curlHelper;
+        $this->orderRepository = $orderRepository;
+        $this->_addressConfig = $addressConfig;
+        $this->transactionCollectionFactory = $recurringTransactions;
     }
 
     /**
@@ -1110,4 +1136,100 @@ public function getRecurringOrderBufferTime()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
+    /**
+     * Get Recurring Order Reminder Email Template
+     *
+     * @return string
+     */
+    public function getRecurringOrderReminderEmail()
+    {
+        return $this->scopeConfig->getValue(
+            'worldpay/subscriptions/recurring_order_reminder_email',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Get Order Details
+     *
+     * @param int $orderId
+     */
+    public function getOrderDetails($orderId)
+    {
+        $order = $this->orderRepository->get($orderId);
+        $billingAddress = $order->getBillingAddress()->getData();
+        $formattedShippingAddress = '';
+        if ($order->getIsNotVirtual()) {
+            $shippingAddress = $order->getShippingAddress()->getData();
+            $formattedShippingAddress = $this->getFormatAddressByCode($shippingAddress);
+        }
+        
+        $paymentMethod = $order->getPayment()->getAdditionalInformation('method_title');
+        $orderDetails = [
+            'order' => $order,
+            'order_id' => $order->getId(),
+            'payment_html' => $paymentMethod,
+            'formattedBillingAddress' => $this->getFormatAddressByCode($billingAddress),
+            'formattedShippingAddress' => $formattedShippingAddress,
+            'is_not_virtual' => $order->getIsNotVirtual()
+        ];
+        return $orderDetails;
+    }
+
+    /**
+     * Format Shipping Address
+     *
+     * @param array $address
+     * @return array
+     */
+    public function getFormatAddressByCode($address)
+    {
+        $renderer = $this->_addressConfig->getFormatByCode('html')->getRenderer();
+        return $renderer->renderArray($address);
+    }
+
+    /**
+     * Get next recurring order
+     *
+     * @param int $subscriptionId
+     * @param int $customerId
+     * @return array
+     */
+    public function getNextRecurringOrder($subscriptionId, $customerId)
+    {
+        $nextOrder = $this->getNextRecurringOrderCollection($subscriptionId, $customerId);
+        if (!empty($nextOrder)) {
+            $curdate = date("Y-m-d");
+            $skipDays = self::RECURRING_ORDER_SKIP_DAYS_UPTO;
+            $days = $this->getRecurringOrderBufferTime() + $skipDays;
+            $endDate = strtotime(date("Y-m-d", strtotime($curdate)) . " +".$days." day");
+            $nextOrderDate = strtotime($nextOrder->getRecurringDate());
+            $recurringEndDate = strtotime($nextOrder->getRecurringEndDate());
+            if (($nextOrderDate <= $endDate) && ($nextOrderDate <= $recurringEndDate)) {
+                return $nextOrder;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get next recurring order collection
+     *
+     * @param int $subscriptionId
+     * @param int $customerId
+     * @return array
+     */
+    public function getNextRecurringOrderCollection($subscriptionId, $customerId)
+    {
+        $curdate = date("Y-m-d");
+        $collection = $this->transactionCollectionFactory->getCollection()
+                ->addFieldToFilter('status', ['eq' => 'active'])
+                ->addFieldToFilter('subscription_id', ['eq' => $subscriptionId])
+                ->addFieldToFilter('customer_id', ['eq' => $customerId])
+                ->addFieldToFilter('recurring_date', ['gteq' => $curdate]);
+        if ($collection->getSize()) {
+            return $collection->getFirstItem();
+        }
+        return false;
+    }
 }
diff --git a/Helper/SendRecurringOrdersEmail.php b/Helper/SendRecurringOrdersEmail.php
new file mode 100644
index 0000000..93ca5e6
--- /dev/null
+++ b/Helper/SendRecurringOrdersEmail.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Sapient\Worldpay\Helper;
+
+use \Magento\Framework\App\Helper\Context;
+use \Sapient\Worldpay\Model\Mail\Template\EmailTransportBuilder as TransportBuilder;
+use \Magento\Framework\Translate\Inline\StateInterface;
+use \Magento\Store\Model\StoreManagerInterface;
+
+class SendRecurringOrdersEmail extends \Magento\Framework\App\Helper\AbstractHelper
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    protected $_scopeConfig;
+    /**
+     * @var \Sapient\Worldpay\Logger\WorldpayLogger
+     */
+    protected $wplogger;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManager;
+
+     /**
+      * @var \Magento\Framework\Translate\Inline\StateInterface
+      */
+    protected $inlineTranslation;
+    /**
+     * @var \Sapient\Worldpay\Model\Mail\Template\EmailTransportBuilder
+     */
+    protected $transportBuilder;
+    /**
+     * SendRecurringOrdersEmail constructor
+     *
+     * @param \Sapient\Worldpay\Logger\WorldpayLogger $wplogger
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param TransportBuilder $transportBuilder
+     * @param StoreManagerInterface $storeManager
+     * @param StateInterface $state
+     */
+    public function __construct(
+        \Sapient\Worldpay\Logger\WorldpayLogger $wplogger,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        TransportBuilder $transportBuilder,
+        StoreManagerInterface $storeManager,
+        StateInterface $state
+    ) {
+        $this->_scopeConfig = $scopeConfig;
+        $this->wplogger = $wplogger;
+        $this->storeManager = $storeManager;
+        $this->transportBuilder = $transportBuilder;
+        $this->inlineTranslation = $state;
+    }
+
+    /**
+     * Send Email
+     *
+     * @param array $params
+     * @param string $toEmail
+     */
+    public function sendEmail($params, $toEmail)
+    {
+        $senderDetails = $this->getAdminContactEmail();
+        try {
+            // template variables pass here
+            $templateVars = $params;
+            $templateId = $params['mail_template'];
+            $subject = __("WORLDPAY: ").
+            "Reminder - Recurring order";
+
+            $templateVars['mail_subject'] = $subject;
+            $storeId = $this->storeManager->getStore()->getId();
+            $from = ['email' => $senderDetails['email'], 'name' => $senderDetails['name']];
+            $this->inlineTranslation->suspend();
+  
+            $storeScope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
+            $templateOptions = [
+                'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
+                'store' => $storeId
+            ];
+            $transport = $this->transportBuilder->setTemplateIdentifier($templateId, $storeScope)
+                ->setTemplateOptions($templateOptions)
+                ->setTemplateVars($templateVars)
+                ->setFrom($from)
+                ->addTo($toEmail)
+                ->getTransport();
+            $transport->sendMessage();
+            $this->inlineTranslation->resume();
+        } catch (\Exception $e) {
+            $this->wplogger->info(__('Unable to send email '). $e->getMessage());
+        }
+    }
+
+    /**
+     * Get store admin email and name
+     */
+    public function getAdminContactEmail()
+    {
+        return [
+            'name' =>   $this->_scopeConfig->getValue(
+                'trans_email/ident_support/name',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ),
+            'email' =>   $this->_scopeConfig->getValue(
+                'trans_email/ident_support/email',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ),
+        ];
+    }
+    /**
+     * Send Pay By link Email
+     *
+     * @param array $params
+     */
+    public function sendRecurringOrdersEmail($params)
+    {
+        try {
+                $customerEmail = $params['email'];
+            if (!empty($customerEmail)) {
+                foreach ($customerEmail as $recipientEmail) {
+                    $this->wplogger->info("Recurring Order email to ".$recipientEmail);
+                    $this->sendEmail($params, $recipientEmail);
+                }
+            }
+            
+        } catch (\Exception $e) {
+            $this->wplogger->info(__("Failed to send email:").$e->getMessage());
+        }
+    }
+}
diff --git a/Helper/SkipOrderEmail.php b/Helper/SkipOrderEmail.php
new file mode 100644
index 0000000..bb58f9a
--- /dev/null
+++ b/Helper/SkipOrderEmail.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace Sapient\Worldpay\Helper;
+
+use \Magento\Framework\App\Helper\Context;
+use \Sapient\Worldpay\Model\Mail\Template\EmailTransportBuilder as TransportBuilder;
+use \Magento\Framework\Translate\Inline\StateInterface;
+use \Magento\Store\Model\StoreManagerInterface;
+use Magento\Checkout\Model\Session as CheckoutSession;
+
+class SkipOrderEmail extends \Magento\Framework\App\Helper\AbstractHelper
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    protected $_scopeConfig;
+    /**
+     * @var \Sapient\Worldpay\Logger\WorldpayLogger
+     */
+    protected $wplogger;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManager;
+
+     /**
+      * @var \Magento\Framework\Translate\Inline\StateInterface
+      */
+    protected $inlineTranslation;
+    /**
+     * @var \Sapient\Worldpay\Model\Mail\Template\EmailTransportBuilder
+     */
+    protected $transportBuilder;
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+      protected $_customerSession;
+    
+    /**
+     * @var CheckoutSession
+     */
+    private $checkoutSession;
+    /**
+     * SendPayByLinkEmail constructor
+     *
+     * @param \Sapient\Worldpay\Logger\WorldpayLogger $wplogger
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param TransportBuilder $transportBuilder
+     * @param StoreManagerInterface $storeManager
+     * @param CheckoutSession $checkoutSession
+     * @param StateInterface $state
+     */
+    public function __construct(
+        \Sapient\Worldpay\Logger\WorldpayLogger $wplogger,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        TransportBuilder $transportBuilder,
+        StoreManagerInterface $storeManager,
+        CheckoutSession $checkoutSession,
+        StateInterface $state
+    ) {
+        $this->_scopeConfig = $scopeConfig;
+        $this->wplogger = $wplogger;
+        $this->_customerSession = $customerSession;
+        $this->storeManager = $storeManager;
+        $this->transportBuilder = $transportBuilder;
+        $this->checkoutSession = $checkoutSession;
+        $this->inlineTranslation = $state;
+    }
+
+    /**
+     * Get Customer Emails
+     */
+    public function getCustomerEmail()
+    {
+        if ($this->_customerSession->isLoggedIn()) {
+            $customerEmail = $this->_customerSession->getCustomer()->getEmail();
+        }
+        if (!empty($customerEmail)) {
+            $allEmails = explode(',', $customerEmail);
+            if (!empty($allEmails)) {
+                return $allEmails;
+            }
+        }
+        return [];
+    }
+    /**
+     * Get store admin email and name
+     */
+    public function getAdminContactEmail()
+    {
+        return [
+            'name' => $this->_scopeConfig->getValue(
+                'trans_email/ident_support/name',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ),
+            'email' => $this->_scopeConfig->getValue(
+                'trans_email/ident_support/email',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ),
+        ];
+    }
+    /**
+     * Get Skip Order Notification Email Template
+     *
+     * @return string
+     */
+    public function getSkipOrderEmailTemplate()
+    {
+        return $this->_scopeConfig->getValue(
+            'worldpay/subscriptions/skip_order_notification_email',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+    /**
+     * Send Email
+     *
+     * @param array $params
+     * @param string $toEmail
+     */
+    public function sendEmail($params, $toEmail)
+    {
+        $senderDetails = $this->getAdminContactEmail();
+        $templateId = $this->getSkipOrderEmailTemplate();
+
+        try {
+            // template variables pass here
+            $templateVars = $params;
+            $subject = __("WORLDPAY: ").
+                "Skipped Order".' '.$params['orderId'];
+
+            $templateVars['mail_subject'] = $subject;
+            $storeId = $this->storeManager->getStore()->getId();
+            $from = ['email' => $senderDetails['email'], 'name' => $senderDetails['name']];
+            $this->inlineTranslation->suspend();
+  
+            $storeScope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
+            $templateOptions = [
+                'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
+                'store' => $storeId
+            ];
+            $transport = $this->transportBuilder->setTemplateIdentifier($templateId, $storeScope)
+                ->setTemplateOptions($templateOptions)
+                ->setTemplateVars($templateVars)
+                ->setFrom($from)
+                ->addTo($toEmail)
+                ->getTransport();
+            $transport->sendMessage();
+            $this->inlineTranslation->resume();
+        } catch (\Exception $e) {
+            $this->wplogger->info(__('Unable to send email: '). $e->getMessage());
+        }
+    }
+/**
+ * Send Pay By link Email
+ *
+ * @param array $params
+ */
+    public function sendSkipOrderEmail($params)
+    {
+        try {
+            $customerEmail = $this->getCustomerEmail();
+            if (!empty($customerEmail)) {
+                foreach ($customerEmail as $recipientEmail) {
+                    $this->sendEmail($params, $recipientEmail);
+                    $this->wplogger->info("Skip Order email send to ".$recipientEmail);
+                }
+            }
+        } catch (\Exception $e) {
+            $this->wplogger->info(__("Failed to send email:").$e->getMessage());
+        }
+    }
+}
diff --git a/Model/Config/Source/SamsungPayButtonTypes.php b/Model/Config/Source/SamsungPayButtonTypes.php
new file mode 100644
index 0000000..5f3226a
--- /dev/null
+++ b/Model/Config/Source/SamsungPayButtonTypes.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @copyright 2023 Sapient
+ */
+namespace Sapient\Worldpay\Model\Config\Source;
+
+class SamsungPayButtonTypes extends \Magento\Framework\App\Config\Value
+{
+  /**
+   * ToOption Array
+   *
+   * @return array
+   */
+    public function toOptionArray()
+    {
+        return [
+        ['value' => 'pay-card', 'label' => __('Normal')],
+        ['value' => 'pay-card-dark', 'label' => __('Normal Dark')],
+        ['value' => 'pay-card-ver', 'label' => __('Vertical')],
+        ['value' => 'pay-card-ver-dark', 'label' => __('Vertical Dark ')],
+
+        ];
+    }
+}
diff --git a/Model/EditSubscriptionHistory.php b/Model/EditSubscriptionHistory.php
new file mode 100644
index 0000000..b680a52
--- /dev/null
+++ b/Model/EditSubscriptionHistory.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @copyright 2023 Sapient
+ */
+namespace Sapient\Worldpay\Model;
+
+use Magento\Framework\Model\AbstractModel;
+use Sapient\Worldpay\Api\Data\EditSubscriptionHistoryInterface;
+
+/**
+ * Class Model EditSubscriptionHistory
+ */
+class EditSubscriptionHistory extends AbstractModel implements EditSubscriptionHistoryInterface
+{
+    /**
+     * Initialize EditSubscriptionHistory Model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+        $this->_init(\Sapient\Worldpay\Model\ResourceModel\EditSubscriptionHistory::class);
+    }
+
+    /**
+     * Get Id
+     */
+    public function getId()
+    {
+        return parent::getData(self::ENTITY_ID);
+    }
+
+    /**
+     * Set Id
+     *
+     * @param int $entityId
+     */
+    public function setId($entityId)
+    {
+        return $this->setData(self::ENTITY_ID, $entityId);
+    }
+
+    /**
+     * Get entityId
+     */
+    public function getSubscriptionId()
+    {
+        return parent::getData(self::SUBSCRIPTION_ID);
+    }
+
+    /**
+     * Set Subscription Id
+     *
+     * @param int $subscriptionId
+     */
+    public function setSubscriptionId($subscriptionId)
+    {
+        return $this->setData(self::SUBSCRIPTION_ID, $subscriptionId);
+    }
+
+    /**
+     * Get Customer Id
+     */
+    public function getCustomerId()
+    {
+        return parent::getData(self::CUSTOMER_ID);
+    }
+
+    /**
+     * Set Customer Id
+     *
+     * @param int $customerId
+     */
+    public function setCustomerId($customerId)
+    {
+        return $this->setData(self::CUSTOMER_ID, $customerId);
+    }
+
+    /**
+     * Get Old Data
+     */
+    public function getOldData()
+    {
+        return parent::getData(self::OLD_DATA);
+    }
+
+    /**
+     * Set shipping and payment method Data
+     *
+     * @param mixed $oldData
+     */
+    public function setOldData($oldData)
+    {
+        return $this->setData(self::OLD_DATA, $oldData);
+    }
+
+    /**
+     * Get Created At
+     */
+    public function getCreatedAt()
+    {
+        return $this->setData(self::CREATED_AT);
+    }
+
+    /**
+     * Set Created At
+     *
+     * @param string $createdAt
+     */
+    public function setCreatedAt($createdAt)
+    {
+        return $this->setData(self::CREATED_AT, $createdAt);
+    }
+
+    /**
+     * Get ModifiedAt
+     */
+    public function getModifiedAt()
+    {
+        return $this->setData(self::MODIFIED_DATE);
+    }
+
+    /**
+     * Set Modified At
+     *
+     * @param string $modifiedAt
+     */
+    public function setModifiedAt($modifiedAt)
+    {
+        return $this->setData(self::MODIFIED_DATE, $modifiedAt);
+    }
+}
diff --git a/Model/EditSubscriptionHistoryRepository.php b/Model/EditSubscriptionHistoryRepository.php
new file mode 100644
index 0000000..af832ed
--- /dev/null
+++ b/Model/EditSubscriptionHistoryRepository.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace Sapient\Worldpay\Model;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Sapient\Worldpay\Api\Data\EditSubscriptionHistoryInterface;
+use Sapient\Worldpay\Api\EditSubscriptionHistoryRepositoryInterface;
+use Sapient\Worldpay\Model\ResourceModel\EditSubscriptionHistory;
+use Sapient\Worldpay\Model\ResourceModel\EditSubscriptionHistory\CollectionFactory;
+use Sapient\Worldpay\Model\Recurring\SubscriptionFactory;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Class Model EditSubscriptionHistoryRepository
+ *
+ */
+class EditSubscriptionHistoryRepository implements EditSubscriptionHistoryRepositoryInterface
+{
+    /**
+     * @var $editHistoryFactory
+     */
+    private $editHistoryFactory;
+
+    /**
+     * @var $editHistoryResource
+     */
+    private $editHistoryResource;
+
+    /**
+     * @var $editHistoryCollectionFactory
+     */
+    private $editHistoryCollectionFactory;
+
+    /**
+     * @var $subscriptionFactory
+     */
+    protected $subscriptionFactory;
+
+    /**
+     * @var $customerSession
+     */
+    protected $customerSession;
+
+    /**
+     * @var $serializer
+     */
+    private $serializer;
+    
+    /**
+     * @var $orderRepository
+     */
+    protected $orderRepository;
+
+    /**
+     * @var $addressConfig
+     */
+    protected $addressConfig;
+  
+    /**
+     * Constructor
+     *
+     * @param EditSubscriptionHistoryFactory $editHistoryFactory
+     * @param EditSubscriptionHistory $editHistoryResource
+     * @param CollectionFactory $editHistoryCollectionFactory
+     * @param SubscriptionFactory $subscriptionFactory
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Magento\Customer\Model\Address\Config $addressConfig
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param SerializerInterface $serializer
+     *
+     */
+    public function __construct(
+        EditSubscriptionHistoryFactory $editHistoryFactory,
+        EditSubscriptionHistory $editHistoryResource,
+        CollectionFactory $editHistoryCollectionFactory,
+        SubscriptionFactory $subscriptionFactory,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Magento\Customer\Model\Address\Config $addressConfig,
+        \Magento\Customer\Model\Session $customerSession,
+        SerializerInterface $serializer,
+    ) {
+        $this->editHistoryFactory = $editHistoryFactory;
+        $this->editHistoryResource = $editHistoryResource;
+        $this->editHistoryCollectionFactory = $editHistoryCollectionFactory;
+        $this->subscriptionFactory = $subscriptionFactory;
+        $this->customerSession = $customerSession;
+        $this->serializer = $serializer;
+        $this->orderRepository = $orderRepository;
+        $this->addressConfig = $addressConfig;
+    }
+
+    /**
+     * Get ById
+     *
+     * @param int $id
+     * @return \Sapient\Worldpay\Api\Data\StudentInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getById($id)
+    {
+        $editHistory = $this->editHistoryFactory->create();
+        $this->editHistoryResource->load($editHistory, $id);
+        if (!$editHistory->getId()) {
+            throw new NoSuchEntityException(__('Unable to find History with ID "%1"', $id));
+        }
+        return $editHistory;
+    }
+
+    /**
+     * Save SubscriptionHistory data
+     *
+     * @param EditSubscriptionHistoryInterface $subscriptionHistory
+     * @return mixed
+     */
+    public function save(EditSubscriptionHistoryInterface $subscriptionHistory): mixed
+    {
+        $this->editHistoryResource->save($subscriptionHistory);
+        return $subscriptionHistory;
+    }
+
+    /**
+     * Update Edit History
+     *
+     * @param object $subscriptionOldInfo
+     * @param string $shippingOldAddress
+     * @param string $method
+     */
+    public function updateEditHistory($subscriptionOldInfo, $shippingOldAddress, $method)
+    {
+        $customer = $this->customerSession->getCustomer();
+        $customerId = $customer->getId();
+         
+        $shippingAddress = $this->getShippingAddress($shippingOldAddress);
+
+        $subscriptionHistory = $this->editHistoryFactory->create();
+        $subscriptionOldData = [
+            'payment_method'=>$method,
+            'shipping_address'=>$shippingAddress,
+            'shipping_method' =>$subscriptionOldInfo->getShippingMethod()
+            ];
+        $subscriptionOldData = $this->serializer->serialize($subscriptionOldData);
+
+        $subscriptionHistory->setSubscriptionId($subscriptionOldInfo->getSubscriptionId());
+        $subscriptionHistory->setCustomerId($customerId);
+        $subscriptionHistory->setOldData($subscriptionOldData);
+        $subscriptionHistory->setCreatedAt(date('Y-m-d'));
+        $subscriptionHistory->setModifiedAt(date('Y-m-d'));
+        $subscriptionHistory->save();
+    }
+
+    /**
+     * Get Subscription Data
+     *
+     * @param int $subscriptionId
+     * @return mixed
+     */
+    public function getSubscriptionData($subscriptionId)
+    {
+        $subscription = $this->subscriptionFactory->create();
+        $subscription->load($subscriptionId);
+        return $subscription;
+    }
+
+    /**
+     * Get Shipping address data of specific order
+     *
+     * @param string $address
+     * @return string
+     */
+    
+    public function getShippingAddress($address)
+    {
+        $renderer = $this->addressConfig->getFormatByCode('text')->getRenderer();
+        return $renderer->renderArray($address);
+    }
+}
diff --git a/Model/Recurring/Order/Address/Renderer.php b/Model/Recurring/Order/Address/Renderer.php
new file mode 100644
index 0000000..5d463d7
--- /dev/null
+++ b/Model/Recurring/Order/Address/Renderer.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Sapient\Worldpay\Model\Recurring\Order\Address;
+
+use Magento\Customer\Model\Address\Config as AddressConfig;
+use Magento\Directory\Helper\Data;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+use Sapient\Worldpay\Model\Recurring\Subscription\Address;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Class Renderer used for formatting an order address
+ *
+ * @api
+ * @since 100.0.2
+ */
+class Renderer
+{
+    /**
+     * @var AddressConfig
+     */
+    protected $addressConfig;
+
+    /**
+     * @var EventManager
+     */
+    protected $eventManager;
+
+    /**
+     * @param AddressConfig $addressConfig
+     * @param EventManager $eventManager
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @param StoreManagerInterface|null $storeManager
+     */
+    public function __construct(
+        AddressConfig $addressConfig,
+        EventManager $eventManager,
+        ?ScopeConfigInterface $scopeConfig = null,
+        ?StoreManagerInterface $storeManager = null
+    ) {
+        $this->addressConfig = $addressConfig;
+        $this->eventManager = $eventManager;
+    }
+
+    /**
+     * Format address in a specific way
+     *
+     * @param Address $address
+     * @param string $type
+     * @return string|null
+     */
+    public function format(Address $address, $type)
+    {
+        $formatType = $this->addressConfig->getFormatByCode($type);
+        if (!$formatType || !$formatType->getRenderer()) {
+            return null;
+        }
+        $this->eventManager->dispatch('customer_address_format', ['type' => $formatType, 'address' => $address]);
+        $addressData = $address->getData();
+
+        return $formatType->getRenderer()->renderArray($addressData);
+    }
+}
diff --git a/Model/Recurring/Order/CustomerPaymentTokens.php b/Model/Recurring/Order/CustomerPaymentTokens.php
new file mode 100644
index 0000000..2b41ddd
--- /dev/null
+++ b/Model/Recurring/Order/CustomerPaymentTokens.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\Recurring\Order;
+
+use Sapient\Worldpay\Api\CustomerPaymentTokenInterface;
+
+class CustomerPaymentTokens implements CustomerPaymentTokenInterface
+{
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+    /**
+     * @var \Sapient\Worldpay\Model\SavedTokenFactory $savedTokenFactory
+     */
+    protected $savedToken;
+
+    /**
+     * @var \Magento\Customer\Model\Session $customerSession
+     */
+    protected $customerSession;
+
+    /**
+     * @var \Sapient\Worldpay\Helper\Data $worldpayhelper
+     */
+    protected $worldpayhelper;
+
+    /**
+     * Constructor
+     *
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Sapient\Worldpay\Model\SavedTokenFactory $savedTokenFactory
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Sapient\Worldpay\Helper\Data $worldpayhelper
+     */
+
+    public function __construct(
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Sapient\Worldpay\Model\SavedTokenFactory $savedTokenFactory,
+        \Magento\Customer\Model\Session $customerSession,
+        \Sapient\Worldpay\Helper\Data $worldpayhelper
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->customerSession = $customerSession;
+        $this->savedToken = $savedTokenFactory;
+        $this->worldpayhelper = $worldpayhelper;
+    }
+
+    /**
+     * Get All Tokens
+     *
+     * @param int $customerId
+     * @return mixed
+     */
+    public function getAllTokens($customerId)
+    {
+        $merchantTokenEnabled = $this->worldpayhelper->getMerchantTokenization();
+        $tokenType = $merchantTokenEnabled ? 'merchant' : 'shopper';
+        return  $this->savedToken->create()->getCollection()
+                                    ->addFieldToSelect([
+                                        'card_brand',
+                                        'card_number',
+                                        'cardholder_name',
+                                        'card_expiry_month',
+                                        'card_expiry_year',
+                                        'transaction_identifier',
+                                        'token_code'])
+                                    ->addFieldToFilter('customer_id', ['eq' => $customerId])
+                                    ->addFieldToFilter('token_type', ['eq' => $tokenType]);
+    }
+    /**
+     * Get All Payment Tokens
+     *
+     * @return string
+     */
+
+    public function getAllPaymentTokens()
+    {
+        $jsonResponse = [];
+        if (!$this->customerSession->getCustomerId()) {
+            $jsonResponse['status'] = false;
+            $jsonResponse['msg'] = 'Log in to see saved tokens';
+        }
+
+        try {
+            $savedTokens = $this->getAllTokens($this->customerSession->getCustomerId());
+            if ($savedTokens) {
+                $alltokens = [];
+                foreach ($savedTokens as $key => $token) {
+                    $alltokens[$key]['token_id'] = $token->getId();
+                    $alltokens[$key]['token_code'] = $token->getData('token_code');
+                    $alltokens[$key]['cardholder_name'] = $token->getData('cardholder_name');
+                    $alltokens[$key]['card_number'] = $token->getData('card_number');
+                    $alltokens[$key]['card_expiry_month'] = $token->getData('card_expiry_month');
+                    $alltokens[$key]['card_expiry_year'] = $token->getData('card_expiry_year');
+                }
+
+                $jsonResponse['status'] = true;
+                $jsonResponse['tokens'] = $alltokens;
+                $jsonResponse['msg'] = 'Success';
+            }
+        } catch (\Exception $e) {
+            $jsonResponse['status'] = false;
+            $jsonResponse['msg'] = $e->getMessage();
+        }
+        return json_encode($jsonResponse);
+    }
+}
diff --git a/Model/Recurring/Order/ShippingMethods.php b/Model/Recurring/Order/ShippingMethods.php
new file mode 100644
index 0000000..bb3802c
--- /dev/null
+++ b/Model/Recurring/Order/ShippingMethods.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\Recurring\Order;
+
+use Sapient\Worldpay\Api\RecurringShippingMethodInterface;
+
+use Magento\Quote\Model\Quote\Address\RateRequestFactory;
+use Magento\Quote\Model\Quote\Address\RateCollectorInterfaceFactory;
+use Magento\Customer\Api\AddressRepositoryInterface;
+
+class ShippingMethods implements RecurringShippingMethodInterface
+{
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+    
+    /**
+     * @var OrderFactory $orderFactory
+     */
+    protected $orderFactory;
+
+    /**
+     * @var RateRequestFactory $rateRequestFactory
+     */
+    protected $rateRequestFactory;
+
+    /**
+     * @var RateCollectorInterfaceFactory $rateCollector
+     */
+    protected $rateCollector;
+
+    /**
+     * @var StoreManagerInterface $storeManager
+     */
+    protected $storeManager;
+
+    /**
+     * @var AddressRepositoryInterface $addressRepository
+     */
+    protected $addressRepository;
+
+    /**
+     * @var CartRepositoryInterface $cartRepository
+     */
+    protected $cartRepository;
+
+    /**
+     * @var \Sapient\Worldpay\Logger\WorldpayLogger
+     */
+    protected $wplogger;
+
+    /**
+     * Constructor
+     *
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Sales\Model\OrderFactory $orderFactory
+     * @param RateRequestFactory $rateRequestFactory
+     * @param RateCollectorInterfaceFactory $rateCollector
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param AddressRepositoryInterface $addressRepository
+     * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
+     * @param \Sapient\Worldpay\Logger\WorldpayLogger $wplogger
+     */
+
+    public function __construct(
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Sales\Model\OrderFactory $orderFactory,
+        RateRequestFactory $rateRequestFactory,
+        RateCollectorInterfaceFactory $rateCollector,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        AddressRepositoryInterface $addressRepository,
+        \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
+        \Sapient\Worldpay\Logger\WorldpayLogger $wplogger
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->orderFactory = $orderFactory;
+        $this->rateRequestFactory = $rateRequestFactory;
+        $this->rateCollector = $rateCollector;
+        $this->storeManager = $storeManager;
+        $this->addressRepository = $addressRepository;
+        $this->cartRepository = $cartRepository;
+        $this->wplogger = $wplogger;
+    }
+
+    /**
+     * Get Original IncrementId
+     *
+     * @param int $orderIncrementId
+     *
+     * @return object $order
+     */
+    public function getOriginalOrder($orderIncrementId)
+    {
+        $order = $this->orderFactory->create()->loadByIncrementId($orderIncrementId);
+        return $order;
+    }
+
+     /**
+      * Get Address data
+      *
+      * @param int $addressId
+      *
+      * @return \Magento\Customer\Api\Data\AddressInterface
+      */
+    public function getAddressData($addressId)
+    {
+        try {
+            $addressData = $this->addressRepository->getById($addressId);
+        } catch (\Exception $e) {
+            $this->wplogger->info(__('Address data not found:'). $e->getMessage());
+        };
+        return $addressData;
+    }
+
+    /**
+     * Retrieve text of street lines, concatenated using LF symbol
+     *
+     * @param string $streetData
+     * @return string
+     */
+    public function getStreetFull($streetData)
+    {
+        $street = $streetData;
+        return is_array($street) ? implode("\n", $street) : ($street ?? '');
+    }
+
+    /**
+     * Get Shipping Method
+     *
+     * @param string $orderIncrementId
+     * @param string $addressId
+     * @return string
+     */
+
+    public function getShippingMethod($orderIncrementId, $addressId)
+    {
+        $order = $this->getOriginalOrder($orderIncrementId);
+        $storeId = $order->getStoreId();
+        $addressData = $this->getAddressData($addressId);
+        $quote = $this->cartRepository->get($order->getQuoteId());
+        /** @var $request RateRequest */
+        $request = $this->rateRequestFactory->create();
+        $request->setAllItems($quote->getAllItems());
+        $request->setDestCountryId($addressData->getCountryId());
+        $request->setDestRegionId($addressData->getRegionId());
+        if ($addressData->getRegionId()) {
+            $request->setDestRegionCode($addressData->getRegionId());
+        }
+        $request->setDestStreet($this->getStreetFull($addressData->getStreet()));
+        $request->setDestCity($addressData->getCity());
+        $request->setDestPostcode($addressData->getPostcode());
+        $baseSubtotal = $order->getBaseSubtotal();
+        $request->setPackageValue($baseSubtotal);
+        $baseSubtotalWithDiscount = $baseSubtotal + $order->getBaseDiscountAmount();
+        $packageWithDiscount =  $baseSubtotalWithDiscount;
+        $request->setPackageValueWithDiscount($packageWithDiscount);
+        $request->setPackageWeight($order->getWeight());
+        $request->setPackageQty($order->getTotalQtyOrdered());
+
+        /**
+         * Need for shipping methods that use insurance based on price of physical products
+         */
+        $packagePhysicalValue =$baseSubtotal;
+        $request->setPackagePhysicalValue($packagePhysicalValue);
+
+        /**
+         * Store and website identifiers specified from StoreManager
+         */
+        $request->setStoreId($storeId);
+        $request->setWebsiteId($this->storeManager->getWebsite()->getId());
+        /**
+         * $request->setFreeShipping($this->getFreeShipping());
+        */
+        /**
+         * Currencies need to convert in free shipping
+         */
+        $request->setBaseCurrency($order->getBaseCurrencyCode());
+        $request->setPackageCurrency($order->getBaseCurrencyCode());
+        /**
+         * $request->setLimitCarrier($this->getLimitCarrier());
+         */
+        $baseSubtotalInclTax = $order->getBaseSubtotalInclTax();
+        $request->setBaseSubtotalInclTax($baseSubtotalInclTax);
+        $request->setBaseSubtotalWithDiscountInclTax(
+            $order->getBaseSubtotalWithDiscount() +
+            $order->getBaseTaxAmount()
+        );
+
+        $result = $this->rateCollector->create()->collectRates($request)->getResult();
+
+        $shippingRatesArr = [];
+        if ($result) {
+            $shippingRates = $result->getAllRates();
+            
+            foreach ($shippingRates as $key => $shippingRate) {
+                $shippingRatesArr[$key]['carrier'] = $shippingRate->getData('carrier');
+                $shippingRatesArr[$key]['carrier_title'] = $shippingRate->getData('carrier_title');
+                $shippingRatesArr[$key]['method'] = $shippingRate->getData('method');
+                $shippingRatesArr[$key]['method_title'] = $shippingRate->getData('method_title');
+                $shippingRatesArr[$key]['price'] = $shippingRate->getData('price');
+                $shippingRatesArr[$key]['cost'] = $shippingRate->getData('cost');
+            }
+        }
+
+        return json_encode($shippingRatesArr);
+    }
+}
diff --git a/Model/Recurring/Order/UpdateRecurringShipment.php b/Model/Recurring/Order/UpdateRecurringShipment.php
new file mode 100644
index 0000000..184cf32
--- /dev/null
+++ b/Model/Recurring/Order/UpdateRecurringShipment.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\Recurring\Order;
+
+use Sapient\Worldpay\Api\UpdateRecurringShipmentInterface;
+
+use Magento\Quote\Model\Quote\Address\RateRequestFactory;
+use Magento\Quote\Model\Quote\Address\RateCollectorInterfaceFactory;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory as RegionCollectionFactory;
+use Sapient\Worldpay\Model\Recurring\SubscriptionFactory;
+
+class UpdateRecurringShipment implements UpdateRecurringShipmentInterface
+{
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+    /**
+     * @var \Magento\Sales\Model\OrderFactory $orderFactory
+     */
+    protected $orderFactory;
+    
+    /**
+     * @var RateRequestFactory $rateRequestFactory
+     */
+    protected $rateRequestFactory;
+
+    /**
+     * @var RateCollectorInterfaceFactory $rateCollector
+     */
+    protected $rateCollector;
+
+    /**
+     * @var StoreManagerInterface $storeManager
+     */
+    protected $storeManager;
+
+    /**
+     * @var AddressRepositoryInterface $addressRepository
+     */
+    protected $addressRepository;
+
+    /**
+     * @var CartRepositoryInterface $cartRepository
+     */
+    protected $cartRepository;
+
+    /**
+     * @var SubscriptionFactory $subscriptionFactory
+     */
+    protected $subscriptionFactory;
+   
+    /**
+     * @var RegionCollectionFactory $regionCollectionFactory
+     */
+    protected $regionCollectionFactory;
+
+    /**
+     * @var EditSubscriptionHistoryRepository $editSubscriptionRepository
+     */
+    protected $editSubscriptionRepository;
+
+    /**
+     * Recurring UpdateRecurringShipment constructor
+     *
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Sales\Model\OrderFactory $orderFactory
+     * @param RateRequestFactory $rateRequestFactory
+     * @param RateCollectorInterfaceFactory $rateCollector
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param AddressRepositoryInterface $addressRepository
+     * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
+     * @param RegionCollectionFactory $regionCollectionFactory
+     * @param SubscriptionFactory $subscriptionFactory
+     * @param EditSubscriptionHistoryRepository $editSubscriptionRepository
+     */
+
+    public function __construct(
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Sales\Model\OrderFactory $orderFactory,
+        RateRequestFactory $rateRequestFactory,
+        RateCollectorInterfaceFactory $rateCollector,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        AddressRepositoryInterface $addressRepository,
+        \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
+        RegionCollectionFactory $regionCollectionFactory,
+        SubscriptionFactory $subscriptionFactory,
+        \Sapient\Worldpay\Model\EditSubscriptionHistoryRepository $editSubscriptionRepository
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->orderFactory = $orderFactory;
+        $this->rateRequestFactory = $rateRequestFactory;
+        $this->rateCollector = $rateCollector;
+        $this->storeManager = $storeManager;
+        $this->addressRepository = $addressRepository;
+        $this->cartRepository = $cartRepository;
+        $this->regionCollectionFactory = $regionCollectionFactory;
+        $this->subscriptionFactory = $subscriptionFactory;
+        $this->editSubscriptionRepository = $editSubscriptionRepository;
+    }
+
+    /**
+     * Retrieve Original Order data
+     *
+     * @param int $orderIncrementId
+     * @return mixed
+     */
+    public function getOriginalOrder($orderIncrementId)
+    {
+        $order = $this->orderFactory->create()->loadByIncrementId($orderIncrementId);
+        return $order;
+    }
+
+    /**
+     * Retrieve Address data
+     *
+     * @param int $addressId
+     *
+     * @return \Magento\Customer\Api\Data\AddressInterface
+     */
+    public function getAddressData($addressId)
+    {
+        try {
+            $addressData = $this->addressRepository->getById($addressId);
+        } catch (\Exception $e) {
+            throw $e->getMessage();
+        }
+        return $addressData;
+    }
+
+    /**
+     * Retrieve text of street lines, concatenated using LF symbol
+     *
+     * @param string $streetData
+     * @return string
+     */
+    public function getStreetFull($streetData)
+    {
+        $street = $streetData;
+        return is_array($street) ? implode("\n", $street) : ($street ?? '');
+    }
+
+    /**
+     * Update Shipment Data
+     *
+     * @param int $subscriptionId
+     * @return mixed
+     */
+    public function getSubscription($subscriptionId)
+    {
+        return $this->subscriptionFactory
+            ->create()
+            ->load($subscriptionId);
+    }
+
+    /**
+     * Update Shipment Data
+     *
+     * @param mixed $shipmentData
+     * @return string
+     */
+
+    public function updateRecurringShipment($shipmentData) : string
+    {
+        $shipmentUpdateMsg = [
+            'success'=> false,
+            'msg'=> ''
+        ];
+        try {
+            if (!empty($shipmentData)) {
+
+                $orderIncrementId = $shipmentData['orderIncrementId'];
+                $addressId = $shipmentData['addressId'];
+                $shipmentMethodData = $shipmentData['shipping_method'];
+                $subscriptionId = $shipmentData['subscription_id'];
+                $currentSubscription = $this->getSubscription($subscriptionId);
+
+                $addressData = $this->getAddressData($addressId);
+
+                $subscriptionOldInfo = $this->editSubscriptionRepository->getSubscriptionData($subscriptionId);
+                $shippingOldAddress = $subscriptionOldInfo->getShippingAddress();
+                $transactionData = $this->getTransactionData($currentSubscription);
+                $paymentMethod = $transactionData->getMethod();
+                
+                $this->updateAddress($currentSubscription, $addressData);
+                $this->updateShipmentAmount($currentSubscription, $shipmentMethodData);
+                $this->editSubscriptionRepository
+                    ->updateEditHistory(
+                        $subscriptionOldInfo,
+                        $shippingOldAddress,
+                        $paymentMethod
+                    );
+                $shipmentUpdateMsg = [
+                    'success'=> true,
+                    'msg'=> 'Shipping data updated'
+                ];
+            }
+        } catch (\Exception $e) {
+            $shipmentUpdateMsg = [
+                'success'=> false,
+                'msg'=> $e->getMessage()
+            ];
+        }
+        return json_encode($shipmentUpdateMsg);
+    }
+
+    /**
+     * Update Address
+     *
+     * @param object $subscriptionObj
+     * @param mixed $addressData
+     *
+     * @return mixed
+     */
+    public function updateAddress($subscriptionObj, $addressData)
+    {
+        $subscription = $subscriptionObj->getShippingAddress();
+        try {
+
+            if ($addressData->getFirstname() != $subscription->getFirstname() ||
+                $addressData->getLastname() != $subscription->getLastname()
+            ) {
+                $subscription->setFirstname($addressData->getFirstname());
+                $subscription->setLastname($addressData->getLastname());
+                $subscriptionObj->setBillingName($addressData->getFirstname() . ' ' . $addressData->getLastname());
+            }
+
+            if ($addressData->getStreet() != $subscription->getStreet()) {
+                $subscription->setStreet($addressData->getStreet());
+            }
+
+            if ($addressData->getCity() != $subscription->getCity()) {
+                $subscription->setCity($addressData->getCity());
+            }
+
+            /* 'region_id' may not be set for some countries */
+            $regionId = $addressData->getRegionId();
+            if (!empty($regionId) && $regionId != $subscription->getRegionId()) {
+                $region = $this->regionCollectionFactory
+                    ->create()
+                    ->getItemById((int) $regionId);
+
+                $subscription->setRegionId($region->getRegionId());
+                $subscription->setRegion($region->getName());
+            } else {
+                $subscription->setRegionId($regionId);
+                $subscription->setRegion('');
+            }
+
+            if ($addressData->getPostcode() != $subscription->getPostcode()) {
+                $subscription->setPostcode($addressData->getPostcode());
+            }
+
+            if ($addressData->getCountryId() != $subscription->getCountryId()) {
+                $subscription->setCountryId($addressData->getCountryId());
+            }
+          
+            if ($subscriptionObj->getShippingAddress()->hasDataChanges()) {
+                $subscriptionObj->setHasDataChanges(true);
+            }
+            if ($subscriptionObj->hasDataChanges()) {
+                $subscriptionObj->save();
+            }
+        } catch (\Exception $e) {
+            throw $e->getMessage();
+        }
+    }
+
+    /**
+     * Transaction Data
+     *
+     * @param Subscription $subscriptionOrder
+     *
+     * @return mixed
+     */
+    public function getTransactionData(\Sapient\Worldpay\Model\Recurring\Subscription $subscriptionOrder)
+    {
+        return $subscriptionOrder->getTransactionData();
+    }
+    /**
+     * Update Shipping amount
+     *
+     * @param object $subscriptionObj
+     * @param object $shipmentMethodData
+     */
+    public function updateShipmentAmount($subscriptionObj, $shipmentMethodData)
+    {
+        $shipmentPrice = $shipmentMethodData['price'];
+        $shippingMethod = $shipmentMethodData['carrier'].'_'.$shipmentMethodData['method'];
+        $shippingMethodTitle = $shipmentMethodData['carrier_title'].'-'.$shipmentMethodData['method_title'];
+        $subscriptionObj->setData('shipping_method', $shippingMethod);
+        $subscriptionObj->setData('shipping_description', $shippingMethodTitle);
+        $subscriptionObj->setData('shipping_amount', $shipmentPrice);
+        $subscriptionObj->save();
+    }
+}
diff --git a/Model/Recurring/Order/UpdateRecurringToken.php b/Model/Recurring/Order/UpdateRecurringToken.php
new file mode 100644
index 0000000..f769e8f
--- /dev/null
+++ b/Model/Recurring/Order/UpdateRecurringToken.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\Recurring\Order;
+
+use Sapient\Worldpay\Api\UpdateRecurringTokenInterface;
+
+use Magento\Framework\Registry;
+use Sapient\Worldpay\Model\Recurring\SubscriptionFactory;
+
+class UpdateRecurringToken implements UpdateRecurringTokenInterface
+{
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+    /**
+     * @var \Magento\Sales\Model\OrderFactory $orderFactory
+     */
+    protected $orderFactory;
+    
+    /**
+     * @var RateRequestFactory $rateRequestFactory
+     */
+    protected $rateRequestFactory;
+
+    /**
+     * @var RateCollectorInterfaceFactory $rateCollector
+     */
+    protected $rateCollector;
+
+    /**
+     * @var StoreManagerInterface $storeManager
+     */
+    protected $storeManager;
+
+    /**
+     * @var SubscriptionFactory $subscriptionFactory
+     */
+    protected $subscriptionFactory;
+
+    /**
+     * @var Transactions $recurringTransactions
+     */
+    protected $transactionCollectionFactory;
+
+    /**
+     * @var \Magento\Customer\Model\Session $customerSession
+     */
+    protected $customerSession;
+
+    /**
+     * @var Registry $registry
+     */
+    protected $coreRegistry;
+
+    /**
+     * @var \Sapient\Worldpay\Model\Token\Service $savedTokenService
+     */
+    protected $savedTokenService;
+    /**
+     * @var \Sapient\Worldpay\Model\SavedToken $savedToken
+     */
+    protected $savedToken;
+
+    /**
+     * @var EditSubscriptionHistoryRepository $editSubscriptionRepository
+     */
+    protected $editSubscriptionRepository;
+
+    /**
+     * Constructor
+     *
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param SubscriptionFactory $subscriptionFactory
+     * @param Transactions $recurringTransactions
+     * @param Registry $registry
+     * @param Magento\Customer\Model\Session $customerSession
+     * @param \Sapient\Worldpay\Model\Token\Service $savedTokenService
+     * @param \Sapient\Worldpay\Model\SavedToken $savedToken
+     * @param EditSubscriptionHistoryRepository $editSubscriptionRepository
+     *
+     */
+
+    public function __construct(
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        SubscriptionFactory $subscriptionFactory,
+        \Sapient\Worldpay\Model\Recurring\Subscription\Transactions $recurringTransactions,
+        Registry $registry,
+        \Magento\Customer\Model\Session $customerSession,
+        \Sapient\Worldpay\Model\Token\Service $savedTokenService,
+        \Sapient\Worldpay\Model\SavedToken $savedToken,
+        \Sapient\Worldpay\Model\EditSubscriptionHistoryRepository $editSubscriptionRepository
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
+        $this->coreRegistry = $registry;
+        $this->customerSession = $customerSession;
+        $this->transactionCollectionFactory = $recurringTransactions;
+        $this->subscriptionFactory = $subscriptionFactory;
+        $this->savedTokenService = $savedTokenService;
+        $this->savedToken = $savedToken;
+        $this->editSubscriptionRepository = $editSubscriptionRepository;
+    }
+
+    /**
+     * Get store id
+     *
+     * @return int
+     */
+    public function getStoreId()
+    {
+        return $this->storeManager->getStore()->getId();
+    }
+
+    /**
+     * Get token
+     *
+     * @param int $id
+     * @return string
+     */
+    public function getToken($id)
+    {
+        return $this->savedToken->load($id);
+    }
+
+    /**
+     * Get Current Subscription Order
+     *
+     * @return mixed
+     */
+    public function getCurrentSubscriptionOrder()
+    {
+        return $this->coreRegistry->registry('current_subscription_order');
+    }
+
+    /**
+     * Get Active Recurring Transaction
+     *
+     * @param int $subscriptionId
+     * @return mixed
+     */
+    public function getActiveRecurringTransaction($subscriptionId)
+    {
+        $customer = $this->customerSession->getCustomer();
+        return $this->transactionCollectionFactory->getCollection()
+            ->addFieldToFilter('status', ['eq' => 'active'])
+            ->addFieldToFilter('customer_Id', ['eq' => $customer->getId()])
+            ->addFieldToFilter('subscription_id', ['eq' => $subscriptionId]);
+    }
+
+    /**
+     * Update Token Data
+     *
+     * @param string $tokenId
+     * @param string $subscriptionId
+     * @return string
+     */
+
+    public function updateRecurringPaymentToken($tokenId, $subscriptionId): string
+    {
+        $result = [
+            'success' => false,
+            'msg' => ''
+        ];
+        try {
+            $currenntActiveTransaction = $this->getActiveRecurringTransaction($subscriptionId);
+
+            if ($currenntActiveTransaction->getSize()) {
+                
+                $transaction = $currenntActiveTransaction->getFirstItem();
+                $this->verifyTokenFromWorldpay($tokenId);
+
+                $subscriptionOldInfo = $this->editSubscriptionRepository->getSubscriptionData($subscriptionId);
+                $shippingOldAddress = $subscriptionOldInfo->getShippingAddress();
+                $transactionData = $this->getTransactionData($subscriptionOldInfo);
+                $paymentMethod = $transactionData->getMethod();
+
+                $transaction->setData('worldpay_token_id', $tokenId);
+                $transaction->save();
+    
+                $this->editSubscriptionRepository
+                    ->updateEditHistory(
+                        $subscriptionOldInfo,
+                        $shippingOldAddress,
+                        $paymentMethod
+                    );
+                $result = [
+                    'success' => true,
+                    'msg' => 'Token Updated in Recurring order'
+                ];
+            }
+        } catch (\Exception $e) {
+            $result = [
+                'success' => false,
+                'msg' => $e->getMessage()
+            ];
+        }
+        return json_encode($result);
+    }
+
+    /**
+     * Verify Token From Worldpay
+     *
+     * @param int $savedTokenId
+     * @return mixed
+     */
+    public function verifyTokenFromWorldpay($savedTokenId)
+    {
+        $customer = $this->customerSession->getCustomer();
+        $savedToken = $this->getToken($savedTokenId);
+        return $this->savedTokenService->getTokenInquiry(
+            $savedToken,
+            $customer,
+            $this->getStoreId()
+        );
+    }
+
+    /**
+     * Get Transaction Data
+     *
+     * @param Subscription $subscriptionOrder
+     * @return mixed
+     */
+    public function getTransactionData(\Sapient\Worldpay\Model\Recurring\Subscription $subscriptionOrder)
+    {
+        return $subscriptionOrder->getTransactionData();
+    }
+}
diff --git a/Model/Recurring/Subscription.php b/Model/Recurring/Subscription.php
index c482c8f..0d4ce98 100644
--- a/Model/Recurring/Subscription.php
+++ b/Model/Recurring/Subscription.php
@@ -171,6 +171,11 @@ class Subscription extends \Magento\Framework\Model\AbstractModel
      */
     private $recurringHelper;
 
+    /**
+     * @var \Sapient\Worldpay\Model\ResourceModel\SavedToken
+     */
+    private $savedToken;
+
     /**
      * Subscription model constructor.
      *
@@ -186,6 +191,7 @@ class Subscription extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Api\SortOrderBuilder $sortOrderBuilder
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Sapient\Worldpay\Model\Recurring\Subscription\TransactionsFactory $transactionsFactory
+     * @param \Sapient\Worldpay\Model\SavedToken $savedToken
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource||null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb||null $resourceCollection
      * @param array $data
@@ -204,6 +210,7 @@ public function __construct(
         \Magento\Framework\Api\SortOrderBuilder $sortOrderBuilder,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Sapient\Worldpay\Model\Recurring\Subscription\TransactionsFactory $transactionsFactory,
+        \Sapient\Worldpay\Model\SavedToken $savedToken,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
@@ -220,6 +227,7 @@ public function __construct(
         $this->priceCurrency = $priceCurrency;
         $this->transactionsFactory = $transactionsFactory;
         $this->registryObj = $registry;
+        $this->savedToken = $savedToken;
     }
 
     /**
@@ -232,7 +240,9 @@ protected function _construct()
         $this->_init(\Sapient\Worldpay\Model\ResourceModel\Recurring\Subscription::class);
     }
     /**
-     * @inheritdoc
+     * After save
+     *
+     * @return mixed
      */
     public function afterSave()
     {
@@ -431,7 +441,7 @@ public function getBillingAddress()
     /**
      * Retrieve order shipping address
      *
-     * @return \Magento\Sales\Model\Order\Address|null
+     * @return \Sapient\Worldpay\Model\Recurring\Subscription\Address|null
      */
     public function getShippingAddress()
     {
@@ -841,4 +851,23 @@ public function loadByOrderId($order_id)
         $id = $this->getResource()->loadByOriginalOrderIncrementId($order_id);
             return $this->load($id);
     }
+    /**
+     * Function to get is virtual column data
+     */
+    public function getIsVirtual()
+    {
+        return $this->getData('is_virtual');
+    }
+
+    /**
+     * Function to get subscription transaction data
+     */
+    public function getTransactionData()
+    {
+        $transactions = $this->transactionsFactory->create()
+        ->loadBySubscriptionIdActive($this->getSubscriptionId());
+        $tokenDetails = $this->savedToken->load($transactions->getData('worldpay_token_id'));
+        
+        return $tokenDetails;
+    }
 }
diff --git a/Model/Recurring/Subscription/Transactions.php b/Model/Recurring/Subscription/Transactions.php
index 58b02ad..ddf57de 100644
--- a/Model/Recurring/Subscription/Transactions.php
+++ b/Model/Recurring/Subscription/Transactions.php
@@ -21,7 +21,7 @@ class Transactions extends AbstractModel
     private $subscription;
 
     /**
-     * Transactions constructor
+     * Initialize resource model
      *
      * @return void
      */
@@ -124,4 +124,19 @@ public function loadById($entityId)
         $id = $this->getResource()->loadById($entityId);
             return $this->load($id);
     }
+
+    /**
+     * Load Subscription Active order Details
+     *
+     * @param int $subscriptionId
+     * @return array
+     */
+    public function loadBySubscriptionIdActive($subscriptionId)
+    {
+        if (!$subscriptionId) {
+            return;
+        }
+        $id = $this->getResource()->loadBySubscriptionIdActive($subscriptionId);
+           return $this->load($id);
+    }
 }
diff --git a/Model/ResourceModel/EditSubscriptionHistory.php b/Model/ResourceModel/EditSubscriptionHistory.php
new file mode 100644
index 0000000..8a1293d
--- /dev/null
+++ b/Model/ResourceModel/EditSubscriptionHistory.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Sapient\Worldpay\Model\ResourceModel;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
+/**
+ * Class Resource EditSubscriptionHistory
+ */
+class EditSubscriptionHistory extends AbstractDb
+{
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('worldpay_subscription_edit_history', 'entity_id');
+    }
+}
diff --git a/Model/ResourceModel/EditSubscriptionHistory/Collection.php b/Model/ResourceModel/EditSubscriptionHistory/Collection.php
new file mode 100644
index 0000000..ed63dfe
--- /dev/null
+++ b/Model/ResourceModel/EditSubscriptionHistory/Collection.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Sapient\Worldpay\Model\ResourceModel\EditSubscriptionHistory;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+
+/**
+ * EditSubscriptionHistory Collection
+ */
+class Collection extends AbstractCollection
+{
+ 
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Sapient\Worldpay\Model\EditSubscriptionHistory::class,
+            \Sapient\Worldpay\Model\ResourceModel\EditSubscriptionHistory::class
+        );
+    }
+}
diff --git a/Model/ResourceModel/Recurring/Subscription/Address/.LCKCollection.php~ b/Model/ResourceModel/Recurring/Subscription/Address/.LCKCollection.php~
deleted file mode 100644
index 1d2b74d..0000000
--- a/Model/ResourceModel/Recurring/Subscription/Address/.LCKCollection.php~
+++ /dev/null
@@ -1 +0,0 @@
-C:\xampp\htdocs\worldpay\vendor\sapient\module-worldpay\Model\ResourceModel\Recurring\Subscription\Address\Collection.php
\ No newline at end of file
diff --git a/Model/ResourceModel/Recurring/Subscription/Transactions.php b/Model/ResourceModel/Recurring/Subscription/Transactions.php
index 9eaf35b..8054f17 100644
--- a/Model/ResourceModel/Recurring/Subscription/Transactions.php
+++ b/Model/ResourceModel/Recurring/Subscription/Transactions.php
@@ -91,4 +91,21 @@ public function loadById($entityId)
         $id = $this->getConnection()->fetchOne($sql);
         return $id;
     }
+
+    /**
+     * Load Active Transcation detail by $subscriptionId
+     *
+     * @param int $subscriptionId
+     * @return int $id
+     */
+    public function loadBySubscriptionIdActive($subscriptionId)
+    {
+        $active = "active";
+        $table = $this->getMainTable();
+        $where = $this->getConnection()->quoteInto("subscription_id = ?", $subscriptionId);
+        $whereTwo = $this->getConnection()->quoteInto("status = ?", $active);
+        $sql = $this->getConnection()->select()->from($table, ['entity_id'])->where($where)->where($whereTwo);
+        $id = $this->getConnection()->fetchOne($sql);
+        return $id;
+    }
 }
diff --git a/Model/ResourceModel/Recurring/Subscription/Transactions/Collection.php b/Model/ResourceModel/Recurring/Subscription/Transactions/Collection.php
index d045810..b40413a 100644
--- a/Model/ResourceModel/Recurring/Subscription/Transactions/Collection.php
+++ b/Model/ResourceModel/Recurring/Subscription/Transactions/Collection.php
@@ -9,7 +9,7 @@
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
-     * @var string
+     * @var string $_idFieldName
      */
     protected $_idFieldName = 'entity_id';
 
@@ -46,4 +46,18 @@ public function setSubscriptionFilter(\Sapient\Worldpay\Model\Recurring\Subscrip
         }
         return $this;
     }
+
+    /**
+     * Set Status Filter
+     *
+     * @param Subscription $subscription
+     * @return $this
+     */
+    public function setStatusFilter(\Sapient\Worldpay\Model\Recurring\Subscription $subscription)
+    {
+        if ($subscription->getId()) {
+            $this->addFieldToFilter('status', 'active');
+        }
+        return $this;
+    }
 }
diff --git a/Model/ResourceModel/SkipSubscriptionOrder.php b/Model/ResourceModel/SkipSubscriptionOrder.php
new file mode 100644
index 0000000..2437361
--- /dev/null
+++ b/Model/ResourceModel/SkipSubscriptionOrder.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Sapient\Worldpay\Model\ResourceModel;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
+/**
+ * SkipSubscriptionOrder resource
+ */
+class SkipSubscriptionOrder extends AbstractDb
+{
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('worldpay_subscription_skip_orders', 'entity_id');
+    }
+}
diff --git a/Model/ResourceModel/SkipSubscriptionOrder/Collection.php b/Model/ResourceModel/SkipSubscriptionOrder/Collection.php
new file mode 100644
index 0000000..654710a
--- /dev/null
+++ b/Model/ResourceModel/SkipSubscriptionOrder/Collection.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Sapient\Worldpay\Model\ResourceModel\SkipSubscriptionOrder;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+
+/**
+ * SkipSubscriptionOrder Collection
+ */
+class Collection extends AbstractCollection
+{
+    /**
+     * Flag that indicates if plans table has been joined
+     *
+     * @var bool
+     */
+    private $plansJoined = false;
+    
+    /**
+     * Flag that indicates if Subscription table has been joined
+     *
+     * @var bool
+     */
+    private $subscriptionsJoined;
+
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Sapient\Worldpay\Model\SkipSubscriptionOrder::class,
+            \Sapient\Worldpay\Model\ResourceModel\SkipSubscriptionOrder::class
+        );
+    }
+
+    /**
+     * Filter collection by customer id
+     *
+     * @param int $customerId
+     * @return $this
+     */
+    public function addCustomerIdFilter($customerId)
+    {
+        if ($customerId) {
+            $this->addFieldToFilter('main_table.customer_id', $customerId);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Join plans table
+     *
+     * @param array|string $cols
+     * @return $this
+     */
+    public function joinPlans($cols = \Magento\Framework\DB\Select::SQL_WILDCARD)
+    {
+        if ($this->plansJoined) {
+            return $this;
+        }
+
+        $this->getSelect()->joinLeft(
+            ['plans' => 'worldpay_recurring_plans'],
+            'plans.plan_id = subscriptions.plan_id',
+            $cols
+        );
+        $this->plansJoined = true;
+
+        return $this;
+    }
+    /**
+     * Join Subscriptions table
+     *
+     * @param array|string $cols
+     * @return $this
+     */
+    public function joinSubscriptions($cols = \Magento\Framework\DB\Select::SQL_WILDCARD)
+    {
+        if ($this->subscriptionsJoined) {
+            return $this;
+        }
+
+        $this->getSelect()->joinLeft(
+            ['subscriptions' => 'worldpay_subscriptions'],
+            'subscriptions.subscription_id = main_table.subscription_id',
+            $cols
+        );
+        $this->subscriptionsJoined = true;
+
+        return $this;
+    }
+}
diff --git a/Model/ResourceModel/SubscriptionOrder.php b/Model/ResourceModel/SubscriptionOrder.php
new file mode 100644
index 0000000..8ccaf65
--- /dev/null
+++ b/Model/ResourceModel/SubscriptionOrder.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © 2020 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+
+namespace Sapient\Worldpay\Model\ResourceModel;
+
+/**
+ * Resource SubscriptionOrder
+ */
+class SubscriptionOrder extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+  /**
+   * Initialize resource model
+   *
+   * @return void
+   */
+    protected function _construct()
+    {
+        $this->_init('worldpay_recurring_transactions', 'entity_id');
+    }
+}
diff --git a/Model/ResourceModel/SubscriptionOrder/Collection.php b/Model/ResourceModel/SubscriptionOrder/Collection.php
new file mode 100644
index 0000000..e7215e0
--- /dev/null
+++ b/Model/ResourceModel/SubscriptionOrder/Collection.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+
+/**
+ * subscription order collection
+ */
+class Collection extends AbstractCollection
+{
+    /**
+     * Flag that indicates if plans table has been joined
+     *
+     * @var bool
+     */
+    private $plansJoined = false;
+
+    /**
+     * Flag that indicates if subscriptions table has been joined
+     *
+     * @var bool
+     */
+    private $subscriptionsJoined = false;
+
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Sapient\Worldpay\Model\SubscriptionOrder::class,
+            \Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder::class
+        );
+    }
+    
+   /**
+    * Filter collection by customer id
+    *
+    * @param int $customerId
+    * @return $this
+    */
+    public function addCustomerIdFilter($customerId)
+    {
+        if ($customerId) {
+            $this->addFieldToFilter('main_table.customer_id', $customerId);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Join plans table
+     *
+     * @param array|string $cols
+     * @return $this
+     */
+    public function joinPlans($cols = \Magento\Framework\DB\Select::SQL_WILDCARD)
+    {
+        if ($this->plansJoined) {
+            return $this;
+        }
+
+        $this->getSelect()->joinLeft(
+            ['plans' => 'worldpay_recurring_plans'],
+            'plans.plan_id = main_table.plan_id',
+            $cols
+        );
+        $this->plansJoined = true;
+
+        return $this;
+    }
+    /**
+     * Join Subscriptions table
+     *
+     * @param array|string $cols
+     * @return $this
+     */
+    public function joinSubscriptions($cols = \Magento\Framework\DB\Select::SQL_WILDCARD)
+    {
+        if ($this->subscriptionsJoined) {
+            return $this;
+        }
+
+        $this->getSelect()->joinLeft(
+            ['subscriptions' => 'worldpay_subscriptions'],
+            'subscriptions.subscription_id = main_table.subscription_id',
+            $cols
+        );
+        $this->subscriptionsJoined = true;
+
+        return $this;
+    }
+}
diff --git a/Model/SkipSubscriptionOrder.php b/Model/SkipSubscriptionOrder.php
new file mode 100644
index 0000000..453a1fb
--- /dev/null
+++ b/Model/SkipSubscriptionOrder.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * @copyright 2023 Sapient
+ */
+namespace Sapient\Worldpay\Model;
+
+use Magento\Framework\Model\AbstractModel;
+use Sapient\Worldpay\Api\Data\SkipSubscriptionOrderInterface;
+
+/**
+ * Class EditSubscriptionHistory
+ */
+class SkipSubscriptionOrder extends AbstractModel implements SkipSubscriptionOrderInterface
+{
+    /**
+     * @var \Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder
+     */
+    private $skipSubscriptionOrderCollection;
+
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    /**
+     * @var CollectionFactory
+     */
+    protected $skipSubcriptionCollectionFactory;
+   
+     /**
+      * @var OrderRepositoryInterface
+      */
+    private $orderRepository;
+
+    /**
+     * @var $customerSession
+     */
+    protected $customerSession;
+
+   /**
+    * @var \Sapient\Worldpay\Helper\Recurring
+    */
+    private $recurringHelper;
+
+    /**
+     * Constructor
+     *
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Sapient\Worldpay\Helper\Recurring $recurringhelper
+     * @param CollectionFactory $skipSubcriptionCollectionFactory
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Sapient\Worldpay\Helper\Recurring $recurringhelper,
+        \Sapient\Worldpay\Model\ResourceModel\SkipSubscriptionOrder\CollectionFactory $skipSubcriptionCollectionFactory,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        array $data = []
+    ) {
+        parent::__construct($context, $registry, $resource, $resourceCollection, $data);
+        $this->recurringhelper = $recurringhelper;
+        $this->skipSubcriptionCollectionFactory = $skipSubcriptionCollectionFactory;
+        $this->orderRepository = $orderRepository;
+        $this->customerSession = $customerSession;
+    }
+
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+
+    protected function _construct()
+    {
+        /**
+         * Initialize resource model
+         *
+         * @return void
+         */
+        $this->_init(\Sapient\Worldpay\Model\ResourceModel\SkipSubscriptionOrder::class);
+    }
+    /**
+     * Load Subscription order
+     *
+     * @param string $subscriptionId
+     * @param string $timeFilterby
+     *
+     * @return \Sapient\Worldpay\Model\skipSubscriptionOrderCollection
+     */
+    public function getskipSubscriptionOrderCollection($subscriptionId, $timeFilterby)
+    {
+        if ($this->skipSubscriptionOrderCollection === null) {
+            $this->skipSubscriptionOrderCollection = $this->skipSubcriptionCollectionFactory->create();
+            $this->skipSubscriptionOrderCollection
+                ->addFieldToFilter("main_table.subscription_id", ['eq' => $subscriptionId])
+                ->joinSubscriptions(['product_name'])
+                ->joinPlans(['interval', 'interval_amount'])
+                ->addFieldToFilter('main_table.created_at', ['gteq'=> $timeFilterby])
+                ->addCustomerIdFilter($this->customerSession->getCustomerId())
+                ->addOrder('created_at', \Magento\Framework\Data\Collection::SORT_ORDER_DESC);
+        }
+        return $this->skipSubscriptionOrderCollection;
+    }
+
+    /**
+     * Load Order by origin order id
+     *
+     * @param string $orderId
+     * @return orderRepository
+     */
+    public function getOrderbyOriginalId($orderId)
+    {
+        $order = $this->orderRepository->get($orderId);
+        return $order;
+    }
+
+    /**
+     * Return date for filter
+     *
+     * @param string $timeinterval
+     * @return string
+     */
+    public function getFilterDate($timeinterval)
+    {
+        $period = 'm';
+        if (!empty($timeinterval)) {
+            $timeInt = explode('-', $timeinterval);
+            $period = $timeInt[0];
+        }
+        switch ($period) {
+            case 'm':
+                $time = strtotime(time());//$time = strtotime("-6 month", time());
+                $date = date('Y-01-01');
+                break;
+            case 'y':
+                $date = date('Y-01-01');//date("Y-m-d", $time);
+                break;
+            default:
+                $time = strtotime("-6 month", time());
+                $date = date("Y-m-d", $time);
+        }
+        return $date;
+    }
+
+    /**
+     * Get entityId
+     */
+    public function getId()
+    {
+        return parent::getData(self::ENTITY_ID);
+    }
+
+    /**
+     * Set entityId
+     *
+     * @param int $entityId
+     */
+    public function setId($entityId)
+    {
+        return $this->setData(self::ENTITY_ID, $entityId);
+    }
+
+    /**
+     * Get SubscriptionId
+     */
+    public function getSubscriptionId()
+    {
+        return parent::getData(self::SUBSCRIPTION_ID);
+    }
+
+    /**
+     * Set SubscriptionId
+     *
+     * @param int $subscriptionId
+     */
+    public function setSubscriptionId($subscriptionId)
+    {
+        return $this->setData(self::SUBSCRIPTION_ID, $subscriptionId);
+    }
+
+    /**
+     * Get CustomerId
+     */
+    public function getCustomerId()
+    {
+        return parent::getData(self::CUSTOMER_ID);
+    }
+
+    /**
+     * Set CustomerId
+     *
+     * @param int $customerId
+     */
+    public function setCustomerId($customerId)
+    {
+        return $this->setData(self::CUSTOMER_ID, $customerId);
+    }
+
+    /**
+     * Get IsSkipped
+     */
+    public function getIsSkipped()
+    {
+        return parent::setIsSkipped(self::IS_SKIPPED);
+    }
+
+    /**
+     * Set IsSkipped
+     *
+     * @param bool $isSkipped
+     */
+    public function setIsSkipped($isSkipped)
+    {
+        return $this->setData(self::IS_SKIPPED, $isSkipped);
+    }
+
+    /**
+     * Get NewRecurringDate
+     */
+    public function getNewRecurringDate()
+    {
+        return $this->setData(self::NEW_RECURRING_DATE);
+    }
+
+    /**
+     * Set NewRecurringDate
+     *
+     * @param string $newRecurringDate
+     * return mixed
+     */
+    public function setNewRecurringDate($newRecurringDate)
+    {
+        return $this->setData(self::NEW_RECURRING_DATE, $newRecurringDate);
+    }
+
+    /**
+     * Get OldRecurringDate
+     */
+    public function getOldRecurringDate()
+    {
+        return $this->setData(self::OLD_RECURRING_DATE);
+    }
+
+    /**
+     * Set OldRecurringDate
+     *
+     * @param string $oldRecurringDate
+     */
+    public function setOldRecurringDate($oldRecurringDate)
+    {
+        return $this->setData(self::OLD_RECURRING_DATE, $oldRecurringDate);
+    }
+
+    /**
+     * Get Created Date
+     */
+    public function getCreatedAt()
+    {
+        return $this->setData(self::CREATED_AT);
+    }
+
+    /**
+     * Set Created Date
+     *
+     * @param string $createdAt
+     */
+    public function setCreatedAt($createdAt)
+    {
+        return $this->setData(self::CREATED_AT, $createdAt);
+    }
+
+    /**
+     * Get updated date
+     *
+     * @param string $updatedAt
+     */
+    public function getUpdatedAt()
+    {
+        return $this->setData(self::UPDATED_AT);
+    }
+
+    /**
+     * Set updatedAt
+     *
+     * @param string $updatedAt
+     */
+    public function setUpdatedAt($updatedAt)
+    {
+        return $this->setData(self::UPDATED_AT, $updatedAt);
+    }
+}
diff --git a/Model/SkipSubscriptionOrderRepository.php b/Model/SkipSubscriptionOrderRepository.php
new file mode 100644
index 0000000..6a5a68e
--- /dev/null
+++ b/Model/SkipSubscriptionOrderRepository.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * @copyright 2023 Sapient
+ */
+namespace Sapient\Worldpay\Model;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Sapient\Worldpay\Api\Data\SkipSubscriptionOrderInterface;
+use Sapient\Worldpay\Api\SkipSubscriptionOrderRepositoryInterface;
+use Sapient\Worldpay\Model\ResourceModel\SkipSubscriptionOrder;
+use Sapient\Worldpay\Model\ResourceModel\SkipSubscriptionOrder\CollectionFactory;
+use Sapient\Worldpay\Model\Recurring\SubscriptionFactory;
+
+/**
+ * Class EditSubscriptionHistoryRepository
+ *
+ */
+class SkipSubscriptionOrderRepository implements SkipSubscriptionOrderRepositoryInterface
+{
+    /**
+     * @var  SkipSubscriptionOrderFactory
+     */
+    private $skipOrderFactory;
+
+    /**
+     * @var SkipSubscriptionOrder
+     */
+    private $skipSubscriptionOrder;
+
+    /**
+     * @var SkipSubscriptionOrderResource
+     */
+    private $skipOrderResource;
+
+    /**
+     * @var \Sapient\Worldpay\Model\ResourceModel\SkipSubscriptionOrder\CollectionFactory
+     */
+    private $skipOrderCollectionFactory;
+
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    protected $customerSession;
+
+    /**
+     * @var \Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder\CollectionFactory
+     */
+    protected $subscriptionCollectionFactory;
+
+    /**
+     * @var \Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder
+     */
+    private $subscriptionOrderCollection;
+  
+    /**
+     * @var \Sapient\Worldpay\Model\Recurring\Subscription\TransactionsFactory
+     */
+    protected $transactionFactory;
+
+    /**
+     * @var \Sapient\Worldpay\Model\Recurring\PlanFactory
+     */
+    protected $planFactory;
+
+    /**
+     * @var \Sapient\Worldpay\Helper\SkipOrderEmail
+     */
+    protected $skipOrderEmail;
+
+    /**
+     * @var \Sapient\Worldpay\Logger\WorldpayLogger
+     */
+    protected $wplogger;
+
+    /**
+     * @var \Sapient\Worldpay\Helper\Recurring
+     */
+    protected $recurringhelper;
+
+    /**
+     * Constructor
+     *
+     * @param SkipSubscriptionOrderFactory $skipOrderFactory
+     * @param SkipSubscriptionOrder $skipOrderResource
+     * @param CollectionFactory $skipOrderCollectionFactory
+     * @param \Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder\CollectionFactory $subscriptionCollectionFactory
+     * @param \Magento\Customer\Model\Address\Config $addressConfig
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Sapient\Worldpay\Model\Recurring\Subscription\TransactionsFactory $transactionsFactory
+     * @param \Sapient\Worldpay\Model\Recurring\PlanFactory $planFactory
+     * @param \Sapient\Worldpay\Helper\SkipOrderEmail $skipOrderEmail
+     * @param \Sapient\Worldpay\Logger\WorldpayLogger $wplogger
+     * @param \Sapient\Worldpay\Helper\Recurring $recurringhelper
+     */
+    public function __construct(
+        SkipSubscriptionOrderFactory $skipOrderFactory,
+        SkipSubscriptionOrder $skipOrderResource,
+        CollectionFactory $skipOrderCollectionFactory,
+        \Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder\CollectionFactory $subscriptionCollectionFactory,
+        \Magento\Customer\Model\Address\Config $addressConfig,
+        \Magento\Customer\Model\Session $customerSession,
+        \Sapient\Worldpay\Model\Recurring\Subscription\TransactionsFactory $transactionsFactory,
+        \Sapient\Worldpay\Model\Recurring\PlanFactory $planFactory,
+        \Sapient\Worldpay\Helper\SkipOrderEmail $skipOrderEmail,
+        \Sapient\Worldpay\Logger\WorldpayLogger $wplogger,
+        \Sapient\Worldpay\Helper\Recurring $recurringhelper
+    ) {
+        $this->skipOrderFactory = $skipOrderFactory;
+        $this->skipOrderResource = $skipOrderResource;
+        $this->skipOrderCollectionFactory = $skipOrderCollectionFactory;
+        $this->subscriptionCollectionFactory = $subscriptionCollectionFactory;
+        $this->customerSession = $customerSession;
+        $this->transactionFactory = $transactionsFactory;
+        $this->planFactory = $planFactory;
+        $this->skipOrderEmail = $skipOrderEmail;
+        $this->wplogger = $wplogger;
+        $this->recurringhelper = $recurringhelper;
+    }
+
+    /**
+     * Get Skipked subscription Order By Id
+     *
+     * @param int $id
+     * @return \Sapient\Worldpay\Api\Data\StudentInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getById($id)
+    {
+        $editHistory = $this->skipOrderFactory->create();
+        $this->editHistoryResource->load($editHistory, $id);
+        if (!$editHistory->getId()) {
+            throw new NoSuchEntityException(__('Unable to find History with ID "%1"', $id));
+        }
+        return $editHistory;
+    }
+
+    /**
+     * Save Skipked subscription Order
+     *
+     * @param SkipSubscriptionOrderInterface $skipSubscriptionOrder
+     * @return mixed
+     */
+    public function save(SkipSubscriptionOrderInterface $skipSubscriptionOrder): mixed
+    {
+        $this->skipOrderResource->save($skipSubscriptionOrder);
+        return $skipSubscriptionOrder;
+    }
+
+    /**
+     * Update Skipked subscription Order
+     *
+     * @param mixed $params
+     * @return mixed
+     */
+    public function updateSkipHistory($params)
+    {
+        
+        $subscriptionId = $params['subscriptionId'];
+        $recurringDate  = date('Y-m-d', strtotime($params['nextOrder']));
+        $customer = $this->customerSession->getCustomer();
+        $customerId = $customer->getId();
+        $customerName = $customer->getName();
+        $subscriptionOrderData = $this->getsubscriptionOrderCollection(
+            $subscriptionId,
+            $customerId,
+            $recurringDate
+        );
+        $recurringId = $subscriptionOrderData->getId();
+        $newrecucceringDate = $this->updateSkipOrderDate($recurringId, $recurringDate);
+        $skipOrderHistory = $this->skipOrderFactory->create();
+        try {
+            $orderId = $subscriptionOrderData->getOriginalOrderId();
+            $skipOrderParams['orderId'] = $subscriptionOrderData->getOriginalOrderIncrementId();
+            $skipOrderParams['customerName'] = $customerName;
+            $skipOrderParams['recurring_date'] = $recurringDate;
+            $skipOrderParams['order_data']   = $this->recurringhelper->getOrderDetails($orderId);
+            $skipOrderHistory->setSubscriptionId($subscriptionId);
+            $skipOrderHistory->setCustomerId($customerId);
+            $skipOrderHistory->setNewRecurringDate($newrecucceringDate);
+            $skipOrderHistory->setOldRecurringDate($recurringDate);
+            $skipOrderHistory->save();
+            $this->skipOrderEmail->sendSkipOrderEmail($skipOrderParams);
+
+            $this->wplogger->info(__('Skipped and next order date is: '). $newrecucceringDate);
+            return true;
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
+    /**
+     * Load Subscription order collection
+     *
+     * @param string $subscriptionId
+     * @param string $customerId
+     * @param string $recurringDate
+     *
+     * @return \Sapient\Worldpay\Model\subscriptionOrde
+     */
+    public function getsubscriptionOrderCollection($subscriptionId, $customerId, $recurringDate)
+    {
+        if ($this->subscriptionOrderCollection === null) {
+            $this->subscriptionOrderCollection = $this->subscriptionCollectionFactory->create();
+            $this->subscriptionOrderCollection
+                    ->addFieldToFilter("subscription_id", ['eq' => $subscriptionId])
+                    ->addFieldToFilter("customer_id", ['eq' => $customerId])
+                    ->addFieldToFilter('status', ['eq' => 'active']);
+        }
+        return $this->subscriptionOrderCollection->getFirstItem();
+    }
+
+    /**
+     * Update Subscription order date in database
+     *
+     * @param int $id
+     * @param string $oldRecurringDate
+     * @return string
+     */
+    public function updateSkipOrderDate($id, $oldRecurringDate)
+    {
+        $transactionDetails = $this->transactionFactory->create()->loadById($id);
+
+        if ($transactionDetails) {
+            $date = $transactionDetails->getRecurringDate();
+            $recurringEndDate = $transactionDetails->getRecurringEndDate();
+            $week = strtotime(date("Y-m-d", strtotime($date)) . " +1 week");
+            $monthdate = strtotime(date("Y-m-d", strtotime($date)) . " +1 month");
+            $tmonthsdate = strtotime(date("Y-m-d", strtotime($date)) . " +3 month");
+            $sixmonthsdate = strtotime(date("Y-m-d", strtotime($date)) . " +6 month");
+            $yeardate = strtotime(date("Y-m-d", strtotime($date)) . " +12 month");
+            
+            $plan = $this->planFactory->create()->loadById($transactionDetails->getPlanId());
+            $planInterval = $plan->getInterval();
+
+            if ($planInterval == 'WEEKLY') {
+                $recurringDate = date('Y-m-d', $week);
+            } elseif ($planInterval == 'MONTHLY') {
+                $recurringDate = date('Y-m-d', $monthdate);
+            } elseif ($planInterval == 'QUARTERLY') {
+                $recurringDate = date('Y-m-d', $tmonthsdate);
+            } elseif ($planInterval == 'SEMIANNUAL') {
+                $recurringDate = date('Y-m-d', $sixmonthsdate);
+            } elseif ($planInterval == 'ANNUAL') {
+                $recurringDate = date('Y-m-d', $yeardate);
+            }
+            try {
+                if (strtotime($recurringDate) > strtotime($recurringEndDate)) {
+                    $this->wplogger->info(__('Next order date is greater then End date: '). $recurringDate);
+                    $transactionDetails->setRecurringDate($recurringEndDate);
+                    $transactionDetails->setStatus('completed');
+                    $transactionDetails->save();
+                    return $oldRecurringDate;
+                }
+                $transactionDetails->setRecurringDate($recurringDate);
+                $transactionDetails->save();
+                return $recurringDate;
+
+            } catch (Exception $e) {
+                $this->wplogger
+                    ->info(__('Skipped order date not updated: '). $e->getMessage());
+            }
+        }
+    }
+}
diff --git a/Model/SubscriptionOrder.php b/Model/SubscriptionOrder.php
new file mode 100644
index 0000000..cb0bcce
--- /dev/null
+++ b/Model/SubscriptionOrder.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © 2020 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+
+namespace Sapient\Worldpay\Model;
+
+use Magento\Sales\Api\OrderRepositoryInterface;
+
+class SubscriptionOrder extends \Magento\Framework\Model\AbstractModel
+{
+    /**
+     * @var \Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder
+     */
+    private $subscriptionOrderCollection;
+
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    /**
+     * @var CollectionFactory
+     */
+    protected $subscriptionCollectionFactory;
+   
+     /**
+      * @var OrderRepositoryInterface
+      */
+    private $orderRepository;
+
+    /**
+     * @var $customerSession
+     */
+    protected $customerSession;
+
+   /**
+    * @var \Sapient\Worldpay\Helper\Recurring
+    */
+    private $recurringHelper;
+
+    /**
+     * Constructor
+     *
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Sapient\Worldpay\Helper\Recurring $recurringhelper
+     * @param CollectionFactory $subscriptionCollectionFactory
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Sapient\Worldpay\Helper\Recurring $recurringhelper,
+        \Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder\CollectionFactory $subscriptionCollectionFactory,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        array $data = []
+    ) {
+        parent::__construct($context, $registry, $resource, $resourceCollection, $data);
+        $this->recurringhelper = $recurringhelper;
+        $this->subscriptionCollectionFactory = $subscriptionCollectionFactory;
+        $this->orderRepository = $orderRepository;
+        $this->customerSession = $customerSession;
+    }
+
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(\Sapient\Worldpay\Model\ResourceModel\SubscriptionOrder::class);
+    }
+
+    /**
+     * Load Subscription order
+     *
+     * @param string $subscriptionId
+     * @param string $timeFilterby
+     * @return \Sapient\Worldpay\Model\subscriptionOrde
+     */
+    public function getsubscriptionOrderCollection($subscriptionId, $timeFilterby)
+    {
+        if ($this->subscriptionOrderCollection === null) {
+            $this->subscriptionOrderCollection = $this->subscriptionCollectionFactory->create();
+            $this->subscriptionOrderCollection
+                ->addFieldToFilter("main_table.subscription_id", ['eq' => $subscriptionId])
+                ->joinPlans(['interval', 'interval_amount'])
+                ->joinSubscriptions(['product_name'])
+                ->addFieldToFilter("main_table.status", ['eq' => 'completed'])
+                ->addFieldToFilter('main_table.created_at', ['gteq'=> $timeFilterby])
+                ->addCustomerIdFilter($this->customerSession->getCustomerId())
+                ->addOrder('created_at', \Magento\Framework\Data\Collection::SORT_ORDER_DESC);
+        }
+        return $this->subscriptionOrderCollection;
+    }
+
+    /**
+     * Load Order by origin order id
+     *
+     * @param string $orderId
+     * @return orderRepository
+     */
+    public function getOrderbyOriginalId($orderId)
+    {
+        $order = $this->orderRepository->get($orderId);
+        return $order;
+    }
+
+    /**
+     * Return date for filter
+     *
+     * @param string $timeinterval
+     * @return string
+     */
+    public function getFilterDate($timeinterval)
+    {
+        $period = 'm';
+        if (!empty($timeinterval)) {
+            $timeInt = explode('-', $timeinterval);
+            $period = $timeInt[0];
+        }
+        switch ($period) {
+            case 'm':
+                $time = strtotime(time());//$time = strtotime("-6 month", time());
+                $date = date('Y-01-01');
+                break;
+            case 'y':
+                $date = date('Y-01-01');//date("Y-m-d", $time);
+                break;
+            default:
+                $time = strtotime("-6 month", time());
+                $date = date("Y-m-d", $time);
+        }
+        return $date;
+    }
+}
diff --git a/Model/System/Config/Backend/PluginUpgradeDates.php b/Model/System/Config/Backend/PluginUpgradeDates.php
index a4bf1e1..ff975d1 100644
--- a/Model/System/Config/Backend/PluginUpgradeDates.php
+++ b/Model/System/Config/Backend/PluginUpgradeDates.php
@@ -192,7 +192,7 @@ public function getUpgradeDates()
         } else {
             $value['newVersion'] = isset($currentVersion['newVersion'])?$currentVersion['newVersion']:"";
         }
-        $currentVersionHistoryDataAry = explode(',', $currentVersionHistoryData);
+        $currentVersionHistoryDataAry = explode(',', (string) $currentVersionHistoryData);
         $value['is_new_version'] = false;
         if (!in_array($value['newVersion'], $currentVersionHistoryDataAry)) {
             $value['is_new_version'] = true;
diff --git a/Model/WorldpayConfigProvider.php b/Model/WorldpayConfigProvider.php
index 86e07b1..c820b4f 100644
--- a/Model/WorldpayConfigProvider.php
+++ b/Model/WorldpayConfigProvider.php
@@ -251,14 +251,18 @@ public function getConfig()
                 $config['payment']['ccform']['gpayButtonLocale'] = $this->worldpayHelper->getGpayButtonLocale();
                 $config['payment']['ccform']['appleMerchantid'] = $this->worldpayHelper->appleMerchantId();
                 $config['payment']['ccform']['isApplePayEnable'] = $this->worldpayHelper->isApplePayEnable();
-                $config['payment']['ccform']['applePayButtonColor'] = $this->worldpayHelper->getCheckoutApplePayBtnColor();
-                $config['payment']['ccform']['applePayButtonType'] = $this->worldpayHelper->getCheckoutApplePayBtnType();
-                $config['payment']['ccform']['applePayButtonLocale'] = $this->worldpayHelper->getCheckoutApplePayBtnLocale();
+                $config['payment']['ccform']['applePayButtonColor'] = $this->worldpayHelper
+                        ->getCheckoutApplePayBtnColor();
+                $config['payment']['ccform']['applePayButtonType'] = $this->worldpayHelper
+                        ->getCheckoutApplePayBtnType();
+                $config['payment']['ccform']['applePayButtonLocale'] = $this->worldpayHelper
+                        ->getCheckoutApplePayBtnLocale();
                 
                 // Multishipping Apple Pay configuration
                 $config['payment']['ccform']['msAppleMerchantid'] = $this->worldpayHelper->msAppleMerchantId();
                 $config['payment']['ccform']['isMsApplePayEnable'] = $this->worldpayHelper->isMsApplePayEnable();
                 $config['payment']['ccform']['isSamsungPayEnable'] = $this->worldpayHelper->isSamsungPayEnable();
+                $config['payment']['ccform']['samsungPayButton'] = $this->worldpayHelper->getSamsungPayButtonType();
                 
                 if ($this->worldpayHelper->getEnvironmentMode()=='Live Mode') {
                     $config['payment']['general']['environmentMode'] = "PRODUCTION";
diff --git a/README.txt b/README.txt
index c813b8b..7f65abf 100644
--- a/README.txt
+++ b/README.txt
@@ -2,6 +2,10 @@ Latest releases for all supported version:
 
 For Magento 2.4.6
 
+Worldpay Plugin version: 2.4.6-p30124
+1. Magento 2.4.6-p3 compatible
+2. PHP 8.2 compatibility
+
 Worldpay Plugin version: 2.4.6-p21023
 1. Magento 2.4.6-p2 compatible
 2. PHP 8.2 compatibility
diff --git a/composer.json b/composer.json
index d20f5cd..643e31e 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
       "magento/module-quote": ">=100.0.0",
       "magento/module-vault": ">=100.0.0"
    },
-   "version": "2.4.6-p21023",
+   "version": "2.4.6-p30124",
    "license":"proprietary",
    "autoload":{
       "files":[
diff --git a/docs/Worldpay Plugin For Magento 2 Installation Guide.pdf b/docs/Worldpay Plugin For Magento 2 Installation Guide.pdf
index 9e1456d..98080f6 100644
Binary files a/docs/Worldpay Plugin For Magento 2 Installation Guide.pdf and b/docs/Worldpay Plugin For Magento 2 Installation Guide.pdf differ
diff --git a/docs/Worldpay plugin for Magento 2 user guide.pdf b/docs/Worldpay plugin for Magento 2 user guide.pdf
index 0b8cf54..1a83067 100644
Binary files a/docs/Worldpay plugin for Magento 2 user guide.pdf and b/docs/Worldpay plugin for Magento 2 user guide.pdf differ
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index df6e370..020aa1c 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -104,13 +104,23 @@
                     <label>Payment Methods</label>
                     <source_model>Sapient\Worldpay\Model\Config\Source\PaymentMethodsCC</source_model>
                 </field>
+                <field id="cse_custom_popup" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <frontend_model>Sapient\Worldpay\Block\Adminhtml\System\Config\CsePopup</frontend_model>
+                </field>
                 <field id="cse_enabled" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Client Side Encryption Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>
+                        <![CDATA[Highly Recommended: Client Side Encryption must be enabled to secure shoppers card details]]> 
+                    </comment>
                 </field>
                 <field id="cse_public_key" translate="label" type="textarea" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Public Key</label>
                     <comment>For this detail, You must connect with your Worldpay contact.</comment>
+                    <validate>required-entry</validate>
+                    <depends>
+                        <field id="cse_enabled">1</field>
+                    </depends>
                 </field>
                 <field id="require_cvc" translate="label" type="select" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Require CVC</label>
@@ -730,6 +740,15 @@
                     <label>Recurring Order Buffer Time (in days)</label>
                     <validate>validate-number validate-zero-or-greater validate-not-negative-number</validate>
                 </field>
+                <field id="recurring_order_reminder_email" translate="label" type="select" sortOrder="18" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Recurring Order Reminder Email</label>
+                    <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
+                    <comment>Will be  send 10 days before buffer time</comment>
+                </field>
+                <field id="skip_order_notification_email" translate="label" type="select" sortOrder="19" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Skip Order Notification Email</label>
+                    <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
+                </field>
             </group>
             <!-- Miscellaneous -->
             <group id="miscellaneous" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -1207,23 +1226,11 @@
                         </field>      
                     </group>
                     <group id="samsungpay_ssl" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Samsung Pay </label>
-                        <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Use Custom Logo</label>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        </field> 
-                        <field id="logo_config" translate="label" type="Sapient\Worldpay\Block\Adminhtml\System\Config\Field\Image" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Logo</label>
-                                <backend_model>Sapient\Worldpay\Model\Config\Backend\Image</backend_model>
-                                <upload_dir config="sapient_worldpay/images" scope_info="1">sapient_worldpay/images</upload_dir>
-                                <base_url type="media" scope_info="1">sapient_worldpay/images</base_url>
-                                <comment><![CDATA[Allowed file types: jpg, jpeg, png, gif . <br />
-                                <ul style="margin-left: 2em;">
-                                <li>Recommended size: Logo size should be (50*30)px and Max upto 50KB.</li>
-                                </ul>
-                                ]]></comment>
-                                <depends><field id="enabled">1</field></depends>
-                        </field>            
+                        <label>Samsung Pay </label>       
+                        <field id="samsungpay_button_type" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <label>Button Type</label>
+                            <source_model>Sapient\Worldpay\Model\Config\Source\SamsungPayButtonTypes</source_model>
+                        </field>  
                     </group>                    
                     <depends>
                         <field id="worldpay/payment_method_logo_config/payment_method_logo_config_enabled">1</field>
diff --git a/etc/config.xml b/etc/config.xml
index 1cf7aa6..a388849 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -13,7 +13,7 @@
                 <enabled>1</enabled>
                 <title>Credit Cards</title>
                 <paymentmethods>AMEX-SSL,VISA-SSL,ECMC-SSL</paymentmethods>
-                <cse_enabled>0</cse_enabled>
+                <cse_enabled>1</cse_enabled>
                 <require_cvc>1</require_cvc>
                 <integration_mode>direct</integration_mode>
             </cc_config>
@@ -199,5 +199,12 @@
                 <can_use_for_worldpay_subscription>0</can_use_for_worldpay_subscription>
             </worldpay_paybylink>
         </payment>
+        <dev>
+            <js>
+               <minify_exclude>
+                  <exclude_name>../chromepay/sw.js</exclude_name>
+                </minify_exclude>
+             </js>
+        </dev>
     </default>
 </config>
diff --git a/etc/crontab.xml b/etc/crontab.xml
index a323964..0071b5e 100644
--- a/etc/crontab.xml
+++ b/etc/crontab.xml
@@ -6,6 +6,9 @@
         </job>
     </group>
     <group id="worldpay_transactions">
+        <job name="recurring_order_email" instance="Sapient\Worldpay\Cron\RecurringOrdersEmail" method="execute">
+            <schedule>* * * * *</schedule>
+        </job>
         <job name="recurring_order_transactions" instance="Sapient\Worldpay\Cron\RecurringOrders" method="execute">
             <schedule>* * * * *</schedule>
         </job>
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
index fa0990b..510e238 100644
--- a/etc/db_schema.xml
+++ b/etc/db_schema.xml
@@ -296,4 +296,29 @@
       <column name="id"/>
     </constraint>
   </table>
+  <table name="worldpay_subscription_edit_history" resource="default" engine="innodb" comment="Worldpay Subscription Edit History">
+    <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true" comment="Entity Id"/>
+    <column xsi:type="int" name="subscription_id" padding="10" unsigned="true" nullable="true" identity="false" comment="Subscription Id"/>
+    <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false" comment="Customer Id"/>
+    <column xsi:type="text" name="old_data" nullable="false" comment="Old Subscription Data"/>
+    <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Created At"/>
+    <column xsi:type="timestamp" name="modified_date" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Modified At"/>
+    <constraint xsi:type="primary" referenceId="PRIMARY">
+      <column name="entity_id"/>
+    </constraint>
+  </table>
+  <table name="worldpay_subscription_skip_orders" resource="default" engine="innodb" comment="Worldpay Subscription Edit History">
+    <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true" comment="Entity Id"/>
+    <column xsi:type="int" name="subscription_id" padding="10" unsigned="true" nullable="false" identity="false" comment="Subscription Id"/>
+    <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false" comment="Customer Id"/>
+    <column xsi:type="smallint" name="is_skipped" padding="5" unsigned="true" nullable="false" default="1" identity="false" comment="Is Skipped"/>
+    <column xsi:type="timestamp" name="old_recurring_date" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Old Recurring Date"/>
+    <column xsi:type="timestamp" name="new_recurring_date" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="New Recurring Date"/>
+    <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Created At"/>
+    <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP" comment="Updated At"/>
+    <constraint xsi:type="primary" referenceId="PRIMARY">
+      <column name="entity_id"/>
+    </constraint>
+  </table>
+
 </schema>
diff --git a/etc/di.xml b/etc/di.xml
index d0b9e6d..5ed50e3 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -44,6 +44,18 @@
     <preference for="Magento\Vault\Model\Method\Vault" type="Sapient\Worldpay\Model\PaymentMethods\CcVault" />
     <preference for="Magento\Sales\Model\Order\Email\Sender\OrderSender" type="Sapient\Worldpay\Model\Order\Email\Sender\OrderSender"/>
     <preference for="Sapient\Worldpay\Api\MultishippingInterface" type="Sapient\Worldpay\Model\Multishipping\Multishipping" />
+    <preference for="Sapient\Worldpay\Api\RecurringShippingMethodInterface" type="Sapient\Worldpay\Model\Recurring\Order\ShippingMethods" />
+    <preference for="Sapient\Worldpay\Api\UpdateRecurringShipmentInterface" type="Sapient\Worldpay\Model\Recurring\Order\UpdateRecurringShipment" />
+    <preference for="Sapient\Worldpay\Api\CustomerPaymentTokenInterface" type="Sapient\Worldpay\Model\Recurring\Order\CustomerPaymentTokens" />
+    <preference for="Sapient\Worldpay\Api\UpdateRecurringTokenInterface" type="Sapient\Worldpay\Model\Recurring\Order\UpdateRecurringToken" />
+    <preference for="Sapient\Worldpay\Api\Data\EditSubscriptionHistoryInterface" type="Sapient\Worldpay\Model\EditSubscriptionHistory" />
+    <preference for="Sapient\Worldpay\Api\EditSubscriptionHistoryRepositoryInterface" type="Sapient\Worldpay\Model\EditSubscriptionHistory" />
+   
+    <preference for="Sapient\Worldpay\Api\Data\SkipSubscriptionOrderInterface"
+                type="Sapient\Worldpay\Model\SkipSubscriptionOrder"/>
+    <preference for="Sapient\Worldpay\Api\SkipSubscriptionOrderRepositoryInterface"
+                type="Sapient\Worldpay\Model\SkipSubscriptionOrderRepository"/>
+
     <type name="Sapient\Worldpay\Model\PaymentMethods\CcVault">
         <arguments>
             <argument name="logger" xsi:type="object">Sapient\Worldpay\Logger\WorldpayLogger</argument>
diff --git a/etc/email_templates.xml b/etc/email_templates.xml
index 394c847..365a1d3 100644
--- a/etc/email_templates.xml
+++ b/etc/email_templates.xml
@@ -15,4 +15,6 @@
     <template id="wp_auth_sales_email_order_guest_template" label="New Order for Guest" file="wp_auth_sales_email_order_guest_template.html" type="html" module="Sapient_Worldpay" area="frontend"/>
     <template id="wp_sales_email_paybylink" label="Pay By link" file="wp_pay_by_link_email.html" type="html" module="Sapient_Worldpay" area="frontend"/>    
     <template id="wp_sales_email_paybylink_multishipping" label="Pay By link multishipping" file="wp_paybylink_multishipping_email.html" type="html" module="Sapient_Worldpay" area="frontend"/>
+    <template id="worldpay_subscriptions_skip_order_notification_email" label="Recurring Order Skip Notification" file="wp_skip_order_notification_email.html" type="html" module="Sapient_Worldpay" area="frontend"/>
+    <template id="worldpay_subscriptions_recurring_order_reminder_email" label="Recurring Order Notification" file="wp_recurring_order_notificaion_email.html" type="html" module="Sapient_Worldpay" area="frontend"/>
 </config>
diff --git a/etc/module.xml b/etc/module.xml
index 25d3860..0d662e3 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  	<module name="Sapient_Worldpay" schema_version="1.4.4" setup_version="1.4.4">
+  	<module name="Sapient_Worldpay" schema_version="1.4.5" setup_version="1.4.5">
 	<sequence>
         <module name="Magento_Sales"/>
         <module name="Magento_Customer"/>
diff --git a/etc/webapi.xml b/etc/webapi.xml
index 6941e5b..0b2a4d9 100644
--- a/etc/webapi.xml
+++ b/etc/webapi.xml
@@ -31,4 +31,28 @@
             <resource ref="anonymous"/>
         </resources>
     </route>
+     <route url="/V1/worldpay/mine/estimate-recurring-shipping-methods" method="POST">
+        <service class="Sapient\Worldpay\Api\RecurringShippingMethodInterface" method="getShippingMethod"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+     <route url="/V1/worldpay/mine/update-recurring-shipment" method="POST">
+        <service class="Sapient\Worldpay\Api\UpdateRecurringShipmentInterface" method="updateRecurringShipment"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/worldpay/mine/get-customer-payment-tokens" method="POST">
+        <service class="Sapient\Worldpay\Api\CustomerPaymentTokenInterface" method="getAllPaymentTokens"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/worldpay/mine/update-recurring-payment-token" method="POST">
+        <service class="Sapient\Worldpay\Api\UpdateRecurringTokenInterface" method="updateRecurringPaymentToken"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
 </routes>
\ No newline at end of file
diff --git a/view/adminhtml/templates/system/config/csepopup.phtml b/view/adminhtml/templates/system/config/csepopup.phtml
new file mode 100644
index 0000000..258325f
--- /dev/null
+++ b/view/adminhtml/templates/system/config/csepopup.phtml
@@ -0,0 +1,30 @@
+<?php /* @var $block \Sapient\Worldpay\Block\Adminhtml\System\Config\CsePopup */ ?>
+<script>
+    require([
+        'jquery',
+        'Magento_Ui/js/modal/confirm',
+        'prototype'
+    ], function($, confirmation){
+
+        $(document).ready(function() {
+            $('#worldpay_cc_config_cse_enabled').on('change', function () {
+                var value = $('#worldpay_cc_config_cse_enabled').val();
+                if(value == 0){ 
+                    confirmation({
+                        title: $.mage.__('Highly Recommended'),
+                        content: $.mage.__('Client Side Encryption must be enabled to secure shoppers card details'),
+                        buttons: [ {
+                            text: $.mage.__('Close'),
+                            class: 'action-secondary',
+                            click: function (event) {
+                                this.closeModal(event);
+                            }
+                        }],
+                    });
+
+                }
+            });
+        });
+
+    });
+</script>
\ No newline at end of file
diff --git a/view/frontend/email/wp_recurring_order_notificaion_email.html b/view/frontend/email/wp_recurring_order_notificaion_email.html
new file mode 100644
index 0000000..d99e1fa
--- /dev/null
+++ b/view/frontend/email/wp_recurring_order_notificaion_email.html
@@ -0,0 +1,92 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--@vars {
+"var mail_subject|raw":"Mail Subject",
+"var billing_name":"Customer Name",
+"var recurring_date":"Recurring Date",
+"var product_name":"Product Name",
+"var view_order_url":"View Order Url",
+"var order_data.formattedBillingAddress|raw":"Billing Address",
+"var order_data.formattedShippingAddress|raw":"Shipping Address",
+"var order_data.payment_html|raw":"Payment Details",
+"var order_data.order.shipping_description":"Shipping Description",
+"var shipping_msg":"Shipping message",
+"var expired_msg":"Card Expired message",
+"var order_data.order":"Order",
+"var order_data.order_id": "Order DB Id",
+"var order_data.is_not_virtual":"Order Type"
+} @-->
+<!--@subject {{var mail_subject|raw }} @-->
+{{template config_path="design/email/header_template"}}
+<p>Hi {{var billing_name}},</p>
+<br>
+<p>{{trans "We hope this email finds you well."}}</p>
+
+<p>Your next subscription order is scheduled for <b style="color: red;">{{var recurring_date}}</b>, and we want to ensure a seamless experience for you.</p> 
+{{depend expired_msg}}
+    <p style="color: red;"><b>{{var expired_msg}}</b></p>
+{{/depend}}    
+<p>{{trans "Please review the order details below"}}:</p>
+<h2>{{trans "Order Information"}}:</h2>
+<table class="order-details">
+    <tr>
+        <td class="address-details">
+            <h3>{{trans "Billing Info"}}</h3>
+            <p>{{var order_data.formattedBillingAddress|raw}}</p>
+        </td>
+        {{depend order_data.is_not_virtual}}
+        <td class="address-details">
+            <h3>{{trans "Shipping Info"}}</h3>
+            <p>{{var order_data.formattedShippingAddress|raw}}</p>
+        </td>
+        {{/depend}}
+    </tr>
+    <tr>
+        <td class="method-info">
+            <h3>{{trans "Payment Method"}}</h3>
+            {{var order_data.payment_html|raw}}
+        </td>
+        {{depend order_data.is_not_virtual}}
+        <td class="method-info">
+            <h3>{{trans "Shipping Method"}}</h3>
+            <p>{{var order_data.order.shipping_description}}</p>
+            {{if shipping_msg}}
+            <p>{{var shipping_msg}}</p>
+            {{/if}}
+        </td>
+        {{/depend}}
+    </tr>
+</table>
+{{layout handle="sales_email_order_items" order_id=$order_data.order_id area="frontend"}}
+<br>
+<h2>{{trans "Actions You Can Take"}}:</h2>
+<table style="text-align:center;border:none;margin: 30pt 10pt">
+    <tr>
+        {{depend order_data.is_not_virtual}}
+        <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #3498db; border-radius: 0px; text-align: center;" valign="top" bgcolor="#3498db" align="center"> 
+            <a href="{{var view_order_url}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #3498db; border: solid 1px #3498db; border-radius: 0px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #3498db;">
+                {{trans "Change Shipment"}}</a> 
+        </td><td>&nbsp;&nbsp;</td>
+        {{/depend}}
+        <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #3498db; border-radius: 0px; text-align: center;" valign="top" bgcolor="#3498db" align="center"> 
+            <a href="{{var view_order_url}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #3498db; border: solid 1px #3498db; border-radius: 0px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #3498db;">
+                {{trans "Change Payment Method"}}</a> 
+        </td><td>&nbsp;&nbsp;</td>
+        <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #3498db; border-radius: 0px; text-align: center;" valign="top" bgcolor="#3498db" align="center"> 
+            <a href="{{var view_order_url}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #3498db; border: solid 1px #3498db; border-radius: 0px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #3498db;">
+                {{trans "Skip This Order"}}</a> 
+        </td>
+    </tr>
+</table>
+<p><br></p>
+<p>{{trans "Please ensure that any changes are made before the scheduled date to avoid any inconvenience. If you have any questions or encounter any issues, feel free to reach out to our customer support."}}</p>
+<br>
+
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p><small>{{trans "Note: You are receiving this email because you have recurring order in your account."}}</small></p>
+{{template config_path="design/email/footer_template"}}
\ No newline at end of file
diff --git a/view/frontend/email/wp_skip_order_notification_email.html b/view/frontend/email/wp_skip_order_notification_email.html
new file mode 100644
index 0000000..31fd0e4
--- /dev/null
+++ b/view/frontend/email/wp_skip_order_notification_email.html
@@ -0,0 +1,58 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--@vars {
+"var mail_subject|raw":"Mail Subject",
+"var customerName|raw":"Customer Full Name",
+"var recurring_date":"Recurring Date",
+"var orderId":"Order Id",
+"var order_data.formattedBillingAddress|raw":"Billing Address",
+"var order_data.formattedShippingAddress|raw":"Shipping Address",
+"var order_data.payment_html|raw":"Payment Details",
+"var order_data.order.shipping_description":"Shipping Description",
+"var shipping_msg":"Shipping message",
+"var order_data.order":"Order",
+"var order_data.order_id": "Order DB Id",
+"var order_data.is_not_virtual":"Order Type"
+} @-->
+<!--@subject {{var mail_subject|raw }} @-->
+{{template config_path="design/email/header_template"}}
+<p>{{trans "Hi"}} {{var customerName}},</p><br>
+<p>Your next recurring order (<b style="color: red;">{{var recurring_date}}</b>) has been skipped successfully.</p>
+<h2>{{trans "Order Information"}}:</h2>
+<table class="order-details">
+    <tr>
+        <td class="address-details">
+            <h3>{{trans "Billing Info"}}</h3>
+            <p>{{var order_data.formattedBillingAddress|raw}}</p>
+        </td>
+        {{depend order_data.is_not_virtual}}
+        <td class="address-details">
+            <h3>{{trans "Shipping Info"}}</h3>
+            <p>{{var order_data.formattedShippingAddress|raw}}</p>
+        </td>
+        {{/depend}}
+    </tr>
+    <tr>
+        <td class="method-info">
+            <h3>{{trans "Payment Method"}}</h3>
+            {{var order_data.payment_html|raw}}
+        </td>
+        {{depend order_data.is_not_virtual}}
+        <td class="method-info">
+            <h3>{{trans "Shipping Method"}}</h3>
+            <p>{{var order_data.order.shipping_description}}</p>
+            {{if shipping_msg}}
+            <p>{{var shipping_msg}}</p>
+            {{/if}}
+        </td>
+        {{/depend}}
+    </tr>
+</table>
+{{layout handle="sales_email_order_items" order_id=$order_data.order_id area="frontend"}}
+<br><br>
+<p>{{trans "If you have any questions or encounter any issues, feel free to reach out to our customer support."}} </p>
+{{template config_path="design/email/footer_template"}} 
diff --git a/view/frontend/layout/worldpay_recurring_edit.xml b/view/frontend/layout/worldpay_recurring_edit.xml
index 91fdf2c..186cfe2 100644
--- a/view/frontend/layout/worldpay_recurring_edit.xml
+++ b/view/frontend/layout/worldpay_recurring_edit.xml
@@ -8,9 +8,9 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="customer_account"/>
-<!--    <head>
-        <css src="Sapient_Worldpay::styles.css"/>
-    </head>-->
+    <head>
+        <css src="Sapient_Worldpay::css/wp-myaccount.css" />         
+    </head>
     <body>
         <referenceContainer name="content">
             <block class="Sapient\Worldpay\Block\Recurring\Customer\Subscriptions\Edit"
@@ -18,6 +18,16 @@
                    template="recurring/customer/subscription/edit.phtml"
                    cacheable="false"
             />
+            <block class="Sapient\Worldpay\Block\Recurring\Customer\Subscriptions\OrderInfo" as="worldpay_recurring_orderinfo" name="worldpay.recurring.sales.order.info" after="subscription_edit">
+                 
+                 <container name="recurring.additional.info" as="recurring_additional_info"/>
+            </block>
+        </referenceContainer>
+        <referenceContainer name="recurring.additional.info">
+                <block class="Sapient\Worldpay\Block\Recurring\Customer\Subscriptions\OrderInfo\AddressInfo" as="worldpay_recurring_addressinfo" name="worldpay.recurring.sales.order.info.address" cacheable="false">
+                 </block>
+                <block class="Magento\Framework\View\Element\Template" as="worldpay_recurring_tokens" name="worldpay.recurring.sales.order.tokens"  template="Sapient_Worldpay::recurring/edit/tokens.phtml" cacheable="false">
+                </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/worldpay_recurring_index.xml b/view/frontend/layout/worldpay_recurring_index.xml
index ef2f05b..acd34e0 100644
--- a/view/frontend/layout/worldpay_recurring_index.xml
+++ b/view/frontend/layout/worldpay_recurring_index.xml
@@ -8,6 +8,9 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="customer_account"/>
+    <head>
+        <css src="Sapient_Worldpay::css/wp-myaccount.css" />         
+    </head>
     <body>
         <referenceContainer name="content">
             <block class="Sapient\Worldpay\Block\Recurring\Customer\Subscriptions" name="subscription_list"
diff --git a/view/frontend/layout/worldpay_recurring_order_skiporders.xml b/view/frontend/layout/worldpay_recurring_order_skiporders.xml
new file mode 100644
index 0000000..44253e5
--- /dev/null
+++ b/view/frontend/layout/worldpay_recurring_order_skiporders.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2020 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+     <update handle="customer_account"/>
+     <body>
+        <referenceContainer name="content">
+            <block class="Sapient\Worldpay\Block\SubscriptionSkipOrders" name="subscription_order_list"
+                template="Sapient_Worldpay::recurring/order/skiporders.phtml" cacheable="false"/>
+        </referenceContainer>
+        <referenceBlock name="root">
+            <action method="setHeaderTitle">
+                <argument translate="true" name="title" xsi:type="string">Subscriptions Related Skip Order</argument>
+            </action>
+        </referenceBlock>
+    </body>
+</page>
\ No newline at end of file
diff --git a/view/frontend/layout/worldpay_recurring_order_view.xml b/view/frontend/layout/worldpay_recurring_order_view.xml
new file mode 100644
index 0000000..90239f5
--- /dev/null
+++ b/view/frontend/layout/worldpay_recurring_order_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2020 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+     <update handle="customer_account"/>
+     <body>
+        <referenceContainer name="content">
+            <block class="Sapient\Worldpay\Block\SubscriptionOrders" name="subscription_order_list"
+                template="Sapient_Worldpay::recurring/order/view.phtml" cacheable="false"/>
+        </referenceContainer>
+        <referenceBlock name="root">
+            <action method="setHeaderTitle">
+                <argument translate="true" name="title" xsi:type="string">Subscriptions Related Order</argument>
+            </action>
+        </referenceBlock>
+    </body>
+</page>
\ No newline at end of file
diff --git a/view/frontend/layout/worldpay_savedcard_addnewcard.xml b/view/frontend/layout/worldpay_savedcard_addnewcard.xml
index 414cd4e..b420cd9 100644
--- a/view/frontend/layout/worldpay_savedcard_addnewcard.xml
+++ b/view/frontend/layout/worldpay_savedcard_addnewcard.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <update handle="customer_account"/>
+    <head>
+        <css src="Sapient_Worldpay::css/wp-myaccount.css" />         
+    </head>
     <body>
         <referenceContainer name="page.messages">
             <block class="Magento\Framework\View\Element\Template" name="ajax.message.placeholder" template="Magento_Theme::html/messages.phtml"/>
diff --git a/view/frontend/templates/addnewcard.phtml b/view/frontend/templates/addnewcard.phtml
index b072428..0d68aaa 100644
--- a/view/frontend/templates/addnewcard.phtml
+++ b/view/frontend/templates/addnewcard.phtml
@@ -57,7 +57,7 @@
                     class="input-text required cardholder_name validate-cc-number 
                        worldpay-cardholdername-length worldpay-cardnumber-valid cardNumber">
             </div>
-            <div id="card_number_msg" style="color:red;font-size: 1.2rem;"></div>
+            <div id="card_number_msg" class="wp-error"></div>
         </div>
 
         <div class="field card holder name required">
@@ -127,9 +127,9 @@
                            class="input-text required cvv saved-cvv-number required-entry 
                            validate-card-cvv validate-length maximum-length-4 cvc"
                            name="cvc"
-                           value="" style="width:12%"/>
+                           value=""/>
                 </div>
-                <div id="cvv_msg" style="color:red;font-size: 1.2rem;"></div>
+                <div id="cvv_msg" class="wp-error"></div>
             </div> 
     <?php endif; ?>
         <!-- Disclaimer -->
@@ -145,7 +145,7 @@
                 </span>
             <?php endif; ?>
         </label>
-        <div title="Disclaimer!" id="dialog" style="display: none" >
+        <div title="Disclaimer!" id="dialog">
             <form id="disclaimer" name="disclaimer">
                 <div><?= /* @noEscape */ $block->getDisclaimerText(); ?></div>
             </form>
@@ -335,9 +335,7 @@
                             'cvc'
                         ];
             var value = errorHtml[index];
-            jQuery('.'+value).after(
-                '<span class="errmsg" style="color:red;font-size: 1.2rem;">This field is required</span>'
-            );
+            jQuery('.'+value).after('<span class="errmsg wp-error">This field is required</span>');
             jQuery('.'+value).focus();                       
         }
                 
diff --git a/view/frontend/templates/recurring/customer/subscription/edit.phtml b/view/frontend/templates/recurring/customer/subscription/edit.phtml
index 3acee44..d698a80 100644
--- a/view/frontend/templates/recurring/customer/subscription/edit.phtml
+++ b/view/frontend/templates/recurring/customer/subscription/edit.phtml
@@ -3,20 +3,66 @@
  * Copyright © 2018 Worldpay, LLC. All rights reserved.
  * See LICENSE.txt for license details.
  */
-
-
 ?>
 <?php
 /**
  * @var $block \Sapient\Worldpay\Block\Recurring\Customer\Subscriptions\Edit
  */
 ?>
+
 <form class="worldpay-subscription-edit" action="<?= /* @noEscape */  $block->getSaveUrl() ?>"
       method="post" id="worldpay-subscription-edit" enctype="multipart/form-data" 
       data-hasrequired="<?= /* @noEscape */  __('* Required Fields') ?>">
+    <div class="actions-toolbar">
+        <div class="skip-next-order">
+        <?php
+            $nextOrder = $block->getNextRecurringOrder();
+        if (!empty($nextOrder)): ?>
+                <a href="javascript:void(0)"
+                    id="skiporder" class="action primary"
+                    rel="noopener">
+                    <span><?= /* @noEscape */ __('Skip Next Order') ?></span>
+                </a>
+                <span><?= /* @noEscape */ __('Scheduled on') ?></span>
+                <strong id="next-orderdate">
+                    <?= /* @noEscape */  $nextOrder->getRecurringDate() ?>
+                </strong>
+            <?php endif; ?>
+        </div>
+        <div class="all-recurring-order-mobile">
+            <?php if (!empty($nextOrder)): ?>
+                <span class="upcoming-delivery mobile">
+                    <?= /* @noEscape */ __('Upcoming Delivery') ?>
+                </span>
+            <?php endif; ?>
+            <?php if ($block->getRecurringOrderCollection() > 0): ?>
+                <a href="<?= /* @noEscape */  $block->getViewAllRecurringOrder() ?>"
+                    class="action" rel="noopener">
+                    <span><?= /* @noEscape */ __('View All Recurring Order') ?></span>
+                </a>
+            <?php endif; ?>
+        </div>
+    </div>
     <fieldset class="fieldset subscription">
         <?= /* @noEscape */  $block->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?= /* @noEscape */  $block->getMyAccountLabels('AC25') ?></span></legend>
+        <div class="">
+            <legend class="legend">
+                <span><?= /* @noEscape */  $block->getMyAccountLabels('AC25') ?></span>
+                <?php if ($block->getRecurringOrderCollection() > 0): ?>
+                    <a href="<?= /* @noEscape */  $block->getViewAllRecurringOrder() ?>"
+                        class="action all-recurring-order-desktop"
+                        rel="noopener">
+                    <span><?= /* @noEscape */ __('View All Recurring Order') ?></span>
+                </a>
+                <?php endif; ?>
+                <?php if (!empty($nextOrder)): ?>
+                    <span class="upcoming-delivery desktop">
+                        <?= /* @noEscape */ __('Upcoming Delivery') ?>
+                    </span>
+                <?php endif; ?>    
+            </legend>
+        </div>
+        
         <div class="field product-name">
             <label class="label" for="product_name">
                 <span>
@@ -51,112 +97,6 @@
             </div>
         <?php endif; ?>
     </fieldset>
-    <fieldset class="fieldset billing">
-       <legend class="legend"><span><?= /* @noEscape */  $block->getMyAccountLabels('AC31') ?></span></legend>
-        <div class="field firstname required">
-            <label class="label" for="firstname"><span><?= /* @noEscape */  $escaper->escapeHtml(
-                $block->getMyAccountLabels('AC32')
-            ) ?></span></label>
-            <div class="control">
-                <input type="text" name="firstname" data-validate="{required : true, maxlength : 25}"
-                       value="<?= /* @noEscape */  $escaper->escapeHtml(
-                           $block->getSubscription()->getBillingAddress()->getFirstname()
-                       ) ?>"
-                               id="firstname" class="input-text"
-                               title="<?= /* @noEscape */  $escaper->escapeHtml(__('First Name')) ?>"/>
-            </div>
-        </div>
-        <div class="field lastname required">
-            <label class="label" for="lastname"><span><?= /* @noEscape */  $escaper->escapeHtml(
-                $block->getMyAccountLabels('AC33')
-            )
-                                        ?></span></label>
-            <div class="control">
-                <input type="text" name="lastname" data-validate="{required : true, maxlength : 25}"
-                       value="<?= /* @noEscape */  $escaper->escapeHtml(
-                           $block->getSubscription()->getBillingAddress()->getLastname()
-                       ) ?>"
-                               id="lastname" class="input-text" 
-                               title="<?= /* @noEscape */  $escaper->escapeHtml(__('Last Name')) ?>"/>
-            </div>
-        </div>
-        <div class="field street required">
-            <label class="label" for="street">
-                <span>
-                <?= /* @noEscape */ $escaper->escapeHtml($block->getMyAccountLabels('AC34')) ?>
-                </span></label>
-            <div class="control">
-                <input type="text" name="street" data-validate="{required : true, maxlength : 35}"
-                       value="<?= /* @noEscape */  $escaper->escapeHtml(
-                           $block->getSubscription()->getBillingAddress()->getStreet()
-                       ) ?>"
-                               id="street" class="input-text" 
-                               title="<?= /* @noEscape */  $escaper->escapeHtml(__('Address')) ?>"/>
-            </div>
-        </div>
-        <div class="field city required">
-            <label class="label" for="city">
-                <span><?= /* @noEscape */  $block->getMyAccountLabels('AC35') ?></span></label>
-            <div class="control">
-                <input type="text" name="city"
-                       data-validate="{required : true, maxlength : 35}"
-                       value="<?= /* @noEscape */
-                        $escaper->escapeHtml($block->getSubscription()->getBillingAddress()->getCity()) ?>" 
-                        title="<?= /* @noEscape */  __('City') ?>" class="input-text" id="city" 
-                        title="<?= /* @noEscape */  __('City') ?>"/>
-            </div>
-        </div>
-        <div class="field region required">
-            <label class="label" for="region_id"><span><?= /* @noEscape */  __('State/Province') ?></span></label>
-            <div class="control">
-                <select id="region_id" name="region_id" title="<?= /* @noEscape */
-                $block->getMyAccountLabels('AC38') ?>" class="validate-select">
-                    <option value=""><?= /* @noEscape */  __('Please select a region, state or province.') ?></option>
-                </select>
-                <input type="text" id="region" name="region" value="<?= /* @noEscape */  $escaper->escapeHtml(
-                    $block->getSubscription()->getBillingAddress()->getRegion()
-                ) ?>"  title="<?= /* @noEscape */  __('State/Province') ?>" 
-                class="input-text required-entry"/>
-            </div>
-        </div>
-        <div class="field zip required">
-            <label class="label" for="zip">
-                <span><?= /* @noEscape */  $block->getMyAccountLabels('AC36') ?></span></label>
-            <div class="control">
-                <input type="text" name="postcode" 
-                       data-validate="{required : true, maxlength : 20}" 
-                       value="<?= /* @noEscape */
-                        $escaper->escapeHtml($block->getSubscription()->getBillingAddress()->getPostcode()) ?>"
-                title="<?= /* @noEscape */  __('Zip/Postal Code') ?>" 
-                id="zip" class="input-text validate-zip-international"/>
-            </div>
-        </div>
-        <div class="field country required">
-            <label class="label" for="country">
-                <span>
-                <?= /* @noEscape */  $block->getMyAccountLabels('AC37') ?>
-                </span>
-            </label>
-            <div class="control"><?= /* @noEscape */
-                $block->getLayout()->createBlock(\Magento\Directory\Block\Data::class)->getCountryHtmlSelect(
-                    $block->getSubscription()->getBillingAddress()->getCountryId()
-                ) ?>
-            </div>
-        </div>
-    </fieldset>
-
-    <div class="actions-toolbar">
-        <div class="primary">
-            <button
-                    type="submit"
-                    class="action save primary"
-                    data-action="save-subscription"
-                    title="<?= /* @noEscape */  $escaper->escapeHtml($block->getMyAccountLabels('AC28')); ?>"
-            >
-                <span><?= /* @noEscape */  $escaper->escapeHtml($block->getMyAccountLabels('AC28')); ?></span>
-            </button>
-        </div>
-    </div>
 </form>
 <script type="text/x-magento-init">
     {
@@ -178,3 +118,35 @@
         }
     }
 </script>
+<script>
+    require(['jquery',
+        'mage/url',
+        'prototype'
+    ], function ($, urlBuilder) { 
+        $('#skiporder').on("click", function(event) {
+            $.ajax({
+                url: urlBuilder.build('worldpay/skiporder/'),
+                type: 'POST',
+                dataType: 'json',
+                data: {
+                    subscriptionId: <?= $escaper->escapeHtml(__($block->getSubscription()->getSubscriptionId())) ?>,
+                    nextOrder: '<?= $escaper->escapeHtml(__($block->getNextOrderDate())) ?>',
+                },
+                /** Show loader before send */
+                    beforeSend: function() {
+                        $('body').trigger('processStart');
+                    },
+                    success: function(data, status, xhr) {
+                        console.log(data);
+                        location.reload();
+                    },
+                    error: function (xhr, status, errorThrown) {
+                        console.log('Error happens. Try again.');
+                        console.log(errorThrown);
+                    }
+                }).always(function () {
+                $('body').trigger('processStop');
+            });
+        });           
+    });
+</script>
\ No newline at end of file
diff --git a/view/frontend/templates/recurring/customer/subscription/index.phtml b/view/frontend/templates/recurring/customer/subscription/index.phtml
index b53c4dc..2895031 100644
--- a/view/frontend/templates/recurring/customer/subscription/index.phtml
+++ b/view/frontend/templates/recurring/customer/subscription/index.phtml
@@ -83,7 +83,7 @@
                     <?php endif; ?>
                     <td data-th="<?= /* @noEscape */ $escaper->escapeHtml(__('Status')) ?>"
                         class="col status">
-                            <?= /* @noEscape */ $escaper->escapeHtml($subscription->getStatusLabel()) ?>
+                            <?= /* @noEscape */ $escaper->escapeHtml($subscription->getStatusLabel()) ?>    
                     </td>
                     <td data-th="<?= /* @noEscape */  $escaper->escapeHtml(__('Actions')) ?>" class="col actions">
                         <?php if ($subscription->getStatus() == 'active'): ?>
@@ -95,6 +95,15 @@
                                class="action delete"><span><?= /* @noEscape */  $block->getMyAccountLabels('AC23') ?>
                                 </span></a>
                         <?php endif; ?>
+                        <?php
+                            $subscriptionId = $subscription->getSubscriptionId();
+                            $nextOrder = $block->getNextRecurringOrder($subscriptionId);
+                        if (!empty($nextOrder)) { ?>
+                                <div class="upcoming-delivery">
+                                    <?= /* @noEscape */ __('Upcoming Delivery') ?>
+                                    <?= /* @noEscape */  $nextOrder->getRecurringDate() ?>
+                                </div>
+                        <?php } ?>
                     </td>
                 </tr>
             <?php endforeach; ?>
diff --git a/view/frontend/templates/recurring/edit/order_address_info.phtml b/view/frontend/templates/recurring/edit/order_address_info.phtml
new file mode 100644
index 0000000..8129c84
--- /dev/null
+++ b/view/frontend/templates/recurring/edit/order_address_info.phtml
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php $address_options = $block->getAddressOptions() ?>
+<div id="change_shipping_modal" style="display:none">
+    <div class="shipping-modal-body-content mb-20">
+        <p class="successmsg" data-bind="i18n: successmsg(), attr: {class: msgColor() }"></p>
+        <label><?= $escaper->escapeHtml(__('Shipping Address')) ?>:</label>
+        <select name="current-shipping-addresses" id="ship-address-dropdown" 
+            data-bind="event:{ change: fetchShippingMethodByAddress }" >
+        <?php foreach ($address_options as $key => $option): ?>
+                <option value="<?= $escaper->escapeHtml(__($option['value'])) ?>">
+                <?= $escaper->escapeHtml(__($option['label'])); ?></option>
+        <?php endforeach; ?>
+        </select>
+    </div>
+   
+    <div class="ship-via" data-bind="blockLoader: isLoadingShippingMethod">
+        <!-- ko if: (availableShippingMethods().length)-->
+        <div class="shipping-information-title">
+            <span data-bind="i18n: 'Shipping Method:'"></span>
+        </div>
+         <!-- /ko -->
+        <div class="shipping-information-content">
+                <p class="ship-method-error" style="display:none; color:red" 
+                data-bind="i18n: 'Please select shipping method'"></p>
+                <!-- ko if: (availableShippingMethods().length)-->
+                    <!-- ko foreach: {data: availableShippingMethods(), as: 'item'} -->
+                    <div class="shippingmethods-radio-wrapper">
+                            <input type="radio"  
+                                data-bind="attr: {
+                                    'value': item.identifier,
+                                    id: 'recurring_ship_method' + item.identifier
+                                }" 
+                                name="shipping_method_recurring" >               
+                            <label data-bind="attr: {
+                                    for: 'recurring_ship_method' + item.identifier},
+                                    i18n: item.label">
+                            </label>                 
+                    </div>
+                    <!-- /ko -->
+            <!--/ko-->
+            <!-- ko if: (availableShippingMethods().length == 0)-->
+                <div class="shippingmethods-radio-wrapper">             
+                    <label data-bind="text: 'Shipping method is not available'"></label>                 
+            </div>
+            <!-- /ko-->
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/templates/recurring/edit/order_info.phtml b/view/frontend/templates/recurring/edit/order_info.phtml
new file mode 100644
index 0000000..fc2b215
--- /dev/null
+++ b/view/frontend/templates/recurring/edit/order_info.phtml
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php /** @var $block \Magento\Sales\Block\Order\Info */ ?>
+<?php $_order = $block->getCurrentSubscriptionOrder() ?>
+
+<div class="block block-order-details-view" data-bind="scope: 'worldpay_subscription'">
+    <div class="block-title">
+        <strong><?= $escaper->escapeHtml(__('Subscription Addresses')) ?></strong>
+    </div>
+    <div class="block-content">
+     <div class="box box-order-billing-address">
+            <strong class="box-title">
+                <span><?= $escaper->escapeHtml(__('Billing Address')) ?></span>
+            </strong>
+            <div class="box-content">
+                <address>
+                    <?= /* @noEscape */ $block->getFormattedAddress($_order->getBillingAddress()) ?>
+                </address>     
+            </div>
+        </div>
+        <?php if (!$_order->getIsVirtual()): ?>
+            <div class="box box-order-shipping-address">
+                <strong class="box-title"><span><?= $escaper->escapeHtml(__('Shipping Address')) ?></span></strong>
+                <div class="box-content">
+                    <address><?= /* @noEscape */ $block->getFormattedAddress($_order->getShippingAddress()) ?></address>
+                    <span><a data-bind="click: openShippingPopup" id="change-shipping-address">
+                        <?= $escaper->escapeHtml(__('Change Shipping Address')) ?></a>
+                    </span>
+                </div>
+            </div>
+        <?php endif; ?>
+    </div>
+    <?php if (!$_order->getIsVirtual()): ?>
+    <div class="block-title">
+        <strong><?= $escaper->escapeHtml(__('Shipping Method')) ?></strong>
+    </div>
+    <div class="block-content mb-30">
+        <?php if ($_order->getShippingDescription()): ?>
+            <span><?= $escaper->escapeHtml($_order->getShippingDescription()) ?></span>
+        <?php else: ?>
+            <?= $escaper->escapeHtml(__('No shipping information available')) ?>
+        <?php endif; ?>
+    </div>
+    <?php endif; ?>
+    <div class="block-title">
+        <strong><?= $escaper->escapeHtml(__('Payment Method')) ?></strong>
+    </div>
+    <div class="block-content payment-method">
+        <?php $transactionData = $block->getTransactionData($_order); ?>
+        <p><?= $escaper->escapeHtml(__($transactionData->getCardNumber())) ?> - 
+            <?= $escaper->escapeHtml(__($transactionData->getCardBrand())); ?> </p>
+        <span><a  id="change-payment-method" data-bind="click: openPaymentPopup">
+            <?= $escaper->escapeHtml(__('Change Payment Method')) ?></a>
+        </span>
+    </div>
+
+<?= $block->getChildHtml('recurring_additional_info') ?>
+</div>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "worldpay_subscription": {
+                        "component": "Sapient_Worldpay/js/subscription",
+                        "pm_elementId": "#change-payment-method",
+                        "sp_elementId": "#change-shipping-address",
+                        "sp_popelement": "#change_shipping_modal",
+                        "pm_popelement": "#change_payment_modal",
+                        "order_incrementId": "<?= $escaper->escapeHtml(__($block->getCurrentSubscriptionOrder()
+                            ->getOriginalOrderIncrementId())); ?>",
+                        "current_subscription_id": "<?= $escaper->escapeHtml(__($block->getCurrentSubscriptionOrder()
+                            ->getId())); ?>"
+                    }
+                }
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/view/frontend/templates/recurring/edit/tokens.phtml b/view/frontend/templates/recurring/edit/tokens.phtml
new file mode 100644
index 0000000..6f939dc
--- /dev/null
+++ b/view/frontend/templates/recurring/edit/tokens.phtml
@@ -0,0 +1,17 @@
+<div id="change_payment_modal" style="display:none">
+    <div class="payment-modal-body-content">
+    <p class="successmsg" data-bind="i18n: successmsg(), attr: {class: msgColor() }"></p>
+        <p class="label"><?= $escaper->escapeHtml(__('Your Saved Card')) ?></p>
+        <!-- ko if: (availableTokens().length)-->
+              <!-- ko foreach: {data: availableTokens(), as: 'item'} -->
+                     <!-- ko if: (item.card_number)-->
+                        <div class="paymentmethods-radio-wrapper">
+                                <input type="radio"  data-bind="attr: {'value': item.token_id,id: 'recurring_pay_method' + item.token_code}" name="available_recurring_tokens" >               
+                                <label data-bind="attr: {for: 'recurring_pay_method' + item.token_code},i18n: $parent.getCartLabel.bind(this,item)"></label>   
+                                <span data-bind="attr: {for: 'recurring_pay_method' + item.token_code},i18n: $parent.getCartLabelMessage.bind(this,item)" class="expired"></span>                 
+                        </div>
+                    <!-- /ko -->
+              <!-- /ko -->
+        <!--/ko-->
+    </div>
+</div>
diff --git a/view/frontend/templates/recurring/order/skiporders.phtml b/view/frontend/templates/recurring/order/skiporders.phtml
new file mode 100644
index 0000000..bb2fff4
--- /dev/null
+++ b/view/frontend/templates/recurring/order/skiporders.phtml
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © 2020 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+/*
+* Sapient\Worldpay\Block\SubscriptionSkipOrders
+*/
+?>
+<?php $orderData = $block->getskipSubscriptionOrderCollection(); ?>
+<?php if ($orderData && count($orderData)): ?>
+    <div class="show-order-sort-by" style="flex-direction: row-reverse;
+            flex-wrap: nowrap;justify-content: flex-start;
+            align-items: center;">
+        <div class="field  required" style="display: flex;float: left;
+            flex-direction: row;justify-content: center;
+                align-items: center;">
+            <label class="label" for="Sort By" style="display: block;margin: 5px 10px;" >
+                <span>
+                    <strong class="limiter-label">
+                    <strong>
+                        <?= /* @noEscape */  $escaper->escapeHtml('View:') ?>
+                    </strong>
+                </span>
+            </label>
+            <div>      
+                <span class="limiter-options">
+                <a href="<?= $block->escapeUrl($block->getCompleteOrderlUrl()) ?>">
+                    <?= /* @noEscape */  $escaper->escapeHtml('Completed') ?>
+                </a>
+                </span>
+                <span class="limiter-options">
+                <strong>
+                    <?= /* @noEscape */  $escaper->escapeHtml('Skipped') ?></strong>
+                </span>
+            </div>
+        </div>
+    </div>
+    <div class="show-order-sort-by" 
+    style="display: flex;flex-direction:row-reverse;flex-wrap:nowrap;justify-content:flex-start;align-items:center;">
+    <div class="field  required" 
+    style="display: flex;float:right;flex-direction:row;justify-content:center;align-items:center;">
+        <label class="label" for="Sort By" style="display: block;margin: 0 10px;" >
+            <span>
+                <?= /* @noEscape */  $escaper->escapeHtml(count($orderData) .' Order placed in') ?>
+            </span>
+        </label>
+        <div>
+            <select name="status" title="Order Status" onchange="location= this.value;" >
+                <option value="<?= $block->escapeUrl($block->getOrderFilterURL('m-6')) ?>"
+                    <?php if ($block->checkSelectedFilter('m-6')): ?> 
+                        <?= /* @noEscape */  $escaper->escapeHtml('selected') ?>
+                    <?php endif ?> >
+                    <?= /* @noEscape */  $escaper->escapeHtml('6 Month') ?>
+                </option>
+                <option value="<?= $block->escapeUrl($block->getOrderFilterURL('y-'.date("Y"))) ?>"
+                <?php if ($block->checkSelectedFilter('y-'.date("Y"))): ?> 
+                        <?= /* @noEscape */  $escaper->escapeHtml('selected') ?> 
+                    <?php endif ?> >
+                    <?= /* @noEscape */  $escaper->escapeHtml(date("Y")) ?>
+                </option>
+            </select>
+        </div>
+    </div>
+</div>
+    <div class="table-wrapper subscriptions-list">
+        <table class="data table table-subscriptions-items" id="my-subscriptions-table">
+            <caption class="table-caption"><?= /* @noEscape */  $escaper->escapeHtml(__('Subscriptions')) ?></caption>
+            <thead>
+            <tr>
+                <th scope="col" class="col original-order-id">
+                    <?= /* @noEscape */  $escaper->escapeHtml(__('Order Id#')) ?>
+                </th>
+                <th scope="col" class="col Product">
+                    <?= /* @noEscape */  $escaper->escapeHtml(__('Subscription Item')) ?>
+                </th>
+                <th scope="col" class="col interval">
+                    <?= /* @noEscape */  $escaper->escapeHtml(__('Plan')) ?>
+                </th>
+                <th scope="col" class="col status">
+                <?= /* @noEscape */ $escaper->escapeHtml($block->getMyAccountLabels('AC20')) ?>
+                </th>
+                <th scope="col" class="col created_at">
+                    <?= /* @noEscape */  $escaper->escapeHtml(__('Sheduled At')) ?>
+                </th>
+                <th scope="col" class="col actions">
+                    <?= /* @noEscape */  $escaper->escapeHtml($block->getMyAccountLabels('AC21')) ?>
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php foreach ($orderData as $subscription): ?>
+                <tr>
+                    <td data-th="<?= /* @noEscape */  $escaper->escapeHtml(__('Original Order #')) ?>"
+                        class="col original-order-id">
+                        <?= /* @noEscape */  $escaper->escapeHtml(__('N/A')) ?></td>
+                    </td>
+                    <td data-th="<?= /* @noEscape */  $escaper->escapeHtml(__('Product')) ?>"
+                        class="col product"><?= /* @noEscape */ $escaper->escapeHtml($subscription->getProductName()) ?>
+                    </td>
+                    <td data-th="<?= /* @noEscape */ $escaper->escapeHtml(__('Interval')) ?>" class="col interval">
+                        <?= /* @noEscape */ $escaper->escapeHtml(
+                            $block->getSubscriptionIntervalLabel($subscription->getInterval())
+                        ) ?>
+                    </td>
+                    <td data-th="<?= /* @noEscape */ $escaper->escapeHtml(__('Status')) ?>"
+                        class="col status">
+                        <?= /* @noEscape */ $escaper->escapeHtml(__('Skipped')) ?>
+                    </td>
+                    <td data-th="<?= /* @noEscape */ $escaper->escapeHtml(__('created_at')) ?>" class="col created_at">
+                    <?= /* @noEscape */ $block->formatDate(
+                        $subscription->getData('old_recurring_date'),
+                        \IntlDateFormatter::SHORT,
+                        false,
+                        date_default_timezone_get()
+                    ); ?>
+                    </td>
+                    <td data-th="<?= /* @noEscape */  $escaper->escapeHtml(__('Actions')) ?>" class="col actions">
+                    </td>
+                </tr>
+            <?php endforeach;  ?>
+            </tbody>
+        </table>
+    </div>
+    <?php if ($paginationHtml = $block->getPaginationHtml()): ?>
+        <div class="susbcriptions-toolbar toolbar bottom">
+        <?= /* @noEscape */  $paginationHtml; ?></div>
+    <?php endif ?>
+<?php else: ?>
+    <div class="message info empty">
+        <span>
+            <?= $escaper->escapeHtml(__('You have not any reccurring order yet.')); ?>
+        </span>
+    </div>
+<?php endif ?>
\ No newline at end of file
diff --git a/view/frontend/templates/recurring/order/view.phtml b/view/frontend/templates/recurring/order/view.phtml
new file mode 100644
index 0000000..e4ae6e6
--- /dev/null
+++ b/view/frontend/templates/recurring/order/view.phtml
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Copyright © 2020 Worldpay, LLC. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+/*
+* Sapient\Worldpay\Block\SubscriptionOrders
+*/
+?>
+<?php $orderData = $block->getsubscriptionOrderCollection(); ?>
+<?php if ($orderData && count($orderData)): ?>
+    <div class="show-order-sort-by" style="flex-direction: row-reverse;
+            flex-wrap: nowrap;justify-content: flex-start;
+            align-items: center;">
+        <div class="field  required" style="display: flex;float: left;
+            flex-direction: row;justify-content: center;
+                align-items: center;">
+            <label class="label" for="Sort By" style="display: block;margin: 5px 10px;" >
+                <span>
+                    <strong class="limiter-label">
+                    <strong>
+                        <?= /* @noEscape */  $escaper->escapeHtml('View:') ?>
+                    </strong>
+                </span>
+            </label>
+            <div>      
+                <span class="limiter-options">
+                <strong>
+                    <?= /* @noEscape */  $escaper->escapeHtml('Completed') ?>
+                </strong>
+                </span>
+                <span class="limiter-options">
+                <a href="<?= $block->escapeUrl($block->getSkipOrderlUrl()) ?>">
+                    <?= /* @noEscape */  $escaper->escapeHtml('Skipped') ?></strong>
+                </a>
+                </span>
+            </div>
+        </div>
+    </div>
+    <div class="show-order-sort-by" 
+    style="display:flex;flex-direction:row-reverse;flex-wrap:nowrap;justify-content:flex-start;align-items:center;">
+    <div class="field  required" 
+    style="display:flex;float:right;flex-direction:row;justify-content:center;align-items:center;">
+        <label class="label" for="Sort By" style="display: block;margin: 0 10px;" >
+            <span>
+                <?= /* @noEscape */  $escaper->escapeHtml(count($orderData) .' Order placed in') ?>
+            </span>
+        </label>
+        <div>
+            <select name="status" title="Order Status" onchange="location= this.value;" >
+                <option value="<?= $block->escapeUrl($block->getOrderFilterURL('m-6')) ?>"
+                    <?php if ($block->checkSelectedFilter('m-6')): ?> 
+                        <?= /* @noEscape */  $escaper->escapeHtml('selected') ?>
+                    <?php endif ?> >
+                    <?= /* @noEscape */  $escaper->escapeHtml('6 Month') ?>
+                </option>
+                <option value="<?= $block->escapeUrl($block->getOrderFilterURL('y-'.date("Y"))) ?>"
+                <?php if ($block->checkSelectedFilter('y-'.date("Y"))): ?> 
+                        <?= /* @noEscape */  $escaper->escapeHtml('selected') ?> 
+                    <?php endif ?> >
+                    <?= /* @noEscape */  $escaper->escapeHtml(date("Y")) ?>
+                </option>
+            </select>
+        </div>
+    </div>
+</div>
+    <div class="table-wrapper subscriptions-list">
+        <table class="data table table-subscriptions-items" id="my-subscriptions-table">
+            <caption class="table-caption"><?= /* @noEscape */  $escaper->escapeHtml(__('Subscriptions')) ?></caption>
+            <thead>
+            <tr>
+                <th scope="col" class="col original-order-id">
+                    <?= /* @noEscape */  $escaper->escapeHtml(__('Order Id#')) ?>
+                </th>
+                <th scope="col" class="col Product">
+                    <?= /* @noEscape */  $escaper->escapeHtml(__('Subscription Item')) ?>
+                </th>
+                <th scope="col" class="col interval">
+                    <?= /* @noEscape */  $escaper->escapeHtml(__('Plan')) ?>
+                </th>
+                <th scope="col" class="col status">
+                <?= /* @noEscape */ $escaper->escapeHtml($block->getMyAccountLabels('AC20')) ?>
+                </th>
+                <th scope="col" class="col created_at">
+                    <?= /* @noEscape */  $escaper->escapeHtml(__('Sheduled At')) ?>
+                </th>
+                <th scope="col" class="col actions">
+                    <?= /* @noEscape */  $escaper->escapeHtml($block->getMyAccountLabels('AC21')) ?>
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php foreach ($orderData as $subscription): ?>
+                <tr>
+                    <td data-th="<?= /* @noEscape */  $escaper->escapeHtml(__('Original Order #')) ?>"
+                        class="col original-order-id">
+                        <?= /* @noEscape */ $block->getOrderIdLabel($subscription) ?></td>
+                    </td>
+                    <td data-th="<?= /* @noEscape */  $escaper->escapeHtml(__('Product')) ?>"
+                        class="col product"><?= /* @noEscape */ $escaper->escapeHtml($subscription->getProductName()) ?>
+                    </td>
+                    <td data-th="<?= /* @noEscape */ $escaper->escapeHtml(__('Interval')) ?>" class="col interval">
+                        <?= /* @noEscape */ $escaper->escapeHtml(
+                            $block->getSubscriptionIntervalLabel($subscription->getInterval())
+                        ) ?>
+                        <?= /* @noEscape */ $subscription->getFormattedIntervalAmount() ?>
+                    </td>
+                    <td data-th="<?= /* @noEscape */ $escaper->escapeHtml(__('Status')) ?>"
+                        class="col status">
+                        <?php if ($block->getNotAlreadyCanceled($subscription)): ?>
+                            <?= /* @noEscape */ $escaper->escapeHtml(__('Cancelled')) ?>
+                            <?php else: ?>   
+                                <?= /* @noEscape */ $escaper->escapeHtml($subscription->getStatus()) ?>
+                        <?php endif; ?>
+                    </td>
+                    <td data-th="<?= /* @noEscape */ $escaper->escapeHtml(__('created_at')) ?>" class="col created_at">
+                    <?= /* @noEscape */ $block->formatDate(
+                        $subscription->getCreatedAt(),
+                        \IntlDateFormatter::SHORT,
+                        false,
+                        date_default_timezone_get()
+                    ); ?>
+                    </td>
+                    <td data-th="<?= /* @noEscape */  $escaper->escapeHtml(__('Actions')) ?>" class="col actions">
+                        <?php if ($block->getNotAlreadyCanceled($subscription)): ?>
+                            <a href="<?= /* @noEscape */  $block->getViewlUrl($subscription); ?>">
+                                <span><?= /* @noEscape */ $escaper->escapeHtml(__('View')) ?>
+                            </span></a>
+                        <?php elseif (!$block->checkOrderShipment($subscription) &&
+                                 $block->checkOrderBufferTime($subscription)): ?>
+                            <a href="javascript:void(0)" 
+                               data-cancel-url="<?= /* @noEscape */  $block->getCancelUrl($subscription); ?>"
+                               class="action cancel delete">
+                            <span><?= /* @noEscape */  $block->getMyAccountLabels('AC23') ?>
+                            </span></a>
+                        <?php endif; ?>
+                    </td>
+                </tr>
+            <?php endforeach;  ?>
+            </tbody>
+        </table>
+        <script>
+            require([
+                'jquery',
+                'Magento_Ui/js/modal/confirm'
+            ], function($, confirm) {
+
+                $('.action.cancel').on("click", function(event) {
+                    confirm({
+                        title: 'Cancel Subscription Order',
+                        content: getMyAccountExceptions('MCAM12'),
+                        actions: {
+                            confirm: function() {
+                                window.location.href = $(event.currentTarget).data('cancel-url');
+                            }
+                        }
+                    });
+                });
+            });
+            function getMyAccountExceptions (exceptioncode){
+                var data=window.MyAccountExceptions;
+                var gendata=JSON.parse(data);
+                for (var key in gendata) {
+                    if (gendata.hasOwnProperty(key)) {  
+                        var cxData=gendata[key];
+                    if(cxData['exception_code'].includes(exceptioncode)){
+                        return cxData['exception_module_messages']?cxData['exception_module_messages']
+                        :cxData['exception_messages'];
+                    }
+                    }
+                }
+            }
+        </script>
+    </div>
+    <?php if ($paginationHtml = $block->getPaginationHtml()): ?>
+        <div class="susbcriptions-toolbar toolbar bottom">
+        <?= /* @noEscape */  $paginationHtml; ?></div>
+    <?php endif ?>
+<?php else: ?>
+    <div class="message info empty">
+        <span>
+            <?= $escaper->escapeHtml(__('You have not any reccurring order yet.')); ?>
+        </span>
+    </div>
+<?php endif ?>
\ No newline at end of file
diff --git a/view/frontend/templates/webpayment.phtml b/view/frontend/templates/webpayment.phtml
index 4a0a894..7ea6cd9 100644
--- a/view/frontend/templates/webpayment.phtml
+++ b/view/frontend/templates/webpayment.phtml
@@ -555,12 +555,26 @@ $cusToken = 'Bearer ' . $block->getCustomerToken();
     let expiryMonth = instrumentResponse.details.expiryMonth;
     let expiryYear = instrumentResponse.details.expiryYear;
     let encyptedCseData = cseData.length>0 ? cseData : null;
-     
-    //Add payment information and place the order
-    var paymentDetails = {
-    "paymentMethod": {
-    "method": "worldpay_cc",
-            "additional_data": {
+    var additionalData = "";
+    if(encyptedCseData){
+        additionalData = {
+                    "cc_cid" : "",
+                    "cc_type" : "",
+                    "cc_exp_year" : "",
+                    "cc_exp_month" : "",
+                    "cc_number" : "",
+                    "cc_name" : "",
+                    "save_my_card" : false,
+                    "cse_enabled" : isClientSideEncryptionEnabled(),
+                    "encryptedData" : encyptedCseData,
+                    "tokenCode" : null,
+                    "isSavedCardPayment" : false,
+                    "isChromePay" : "1",
+                    "dfReferenceId": window.sessionId
+            }
+
+    }else{
+        additionalData = {
             "cc_cid" : cvc,
                     "cc_type" : cardType,
                     "cc_exp_year" : expiryYear,
@@ -575,6 +589,16 @@ $cusToken = 'Bearer ' . $block->getCustomerToken();
                     "isChromePay" : "1",
                     "dfReferenceId": window.sessionId
             }
+
+    }
+
+
+
+    //Add payment information and place the order
+    var paymentDetails = {
+    "paymentMethod": {
+    "method": "worldpay_cc",
+            "additional_data": additionalData
     },
             "billing_address": {
             "email": instrumentResponse.payerEmail,
diff --git a/view/frontend/web/css/wp-myaccount.css b/view/frontend/web/css/wp-myaccount.css
new file mode 100644
index 0000000..786e642
--- /dev/null
+++ b/view/frontend/web/css/wp-myaccount.css
@@ -0,0 +1,191 @@
+.wp-right {
+    text-align: right !important;
+}
+.wp-error{
+    color: #e02b27;
+    font-size: 1.2rem;
+}
+.mb-20{
+    margin-bottom: 20px;
+}
+.mb-30{
+    margin-bottom: 30px;
+}
+.worldpay-savedcard-addnewcard .form-edit-account #dialog{
+    display: none;
+}
+.worldpay-savedcard-addnewcard .form-edit-account #cvv{
+    width:12%;
+}
+
+.worldpay-recurring-edit .box-order-billing-address .box-content{
+    padding-left: 10px;
+}
+.worldpay-recurring-edit .box-order-shipping-address .box-title{
+    margin-left: 30px!important;
+}
+.worldpay-recurring-edit .box-order-shipping-address .box-content{
+    padding-left: 40px;
+    border-left: 1.5px solid #808080a3;
+}
+.worldpay-recurring-edit .field.product-name,
+.worldpay-recurring-edit .field.plan{
+    width: 25%;
+    float: left;
+    clear: none;
+}
+.worldpay-recurring-edit .field.plan{
+    border-left: 1.5px solid #808080a3;
+    padding-left: 30px;
+}
+.worldpay-recurring-edit .payment-method p,
+.worldpay-recurring-edit .payment-method span{
+    float: left;
+    padding-right: 40px;
+}
+@media only screen and (max-width: 768px){
+    .worldpay-recurring-edit .account .column.main .block:not(.widget) .block-content .box:last-child {
+        margin-bottom: 30px;
+    }
+    .worldpay-recurring-edit .box-order-shipping-address .box-title{
+        margin-left: 0px!important;
+    }
+    .worldpay-recurring-edit .box-order-shipping-address .box-content{
+        padding-left: 10px;
+        border-left: none;
+        margin-bottom: 20px;
+    }
+    .worldpay-recurring-edit .field.plan{
+        border-left: none;
+        padding-left: 0px;
+    }
+    .worldpay-recurring-edit .field.product-name,
+    .worldpay-recurring-edit .field.plan{
+        width: 100%;
+        float: none;
+        clear: none;
+    }    
+    .worldpay-recurring-edit .payment-method span{
+        padding-bottom: 30px;
+    }
+    .worldpay-recurring-edit .modal-popup.modal-slide {
+        left: 25px;
+        right: 25px;
+    }
+    .worldpay-recurring-edit .all-recurring-order-mobile{
+        display: block;
+        margin: 10px 0;
+    }
+    .worldpay-recurring-edit .all-recurring-order-desktop{
+        display: none;
+    }
+    .worldpay-recurring-edit .upcoming-delivery.desktop{
+        display: none;
+    }
+    .modal-popup .modal-footer .add-new-btn {
+        float: right;
+    }
+}
+.worldpay-recurring-edit .skip-next-order a.action.primary{
+    float: none;
+}
+.worldpay-recurring-edit .skip-next-order strong{
+    color: #eb5202;
+}
+@media only screen and (min-width: 768px){
+    .worldpay-recurring-edit .actions-toolbar{
+        text-align: right;
+    }
+    .worldpay-recurring-edit h1.page-title{
+        margin-bottom: 15px;
+    }
+    .worldpay-recurring-edit .skip-next-order{
+        margin-top: -50px;
+    }    
+    .worldpay-recurring-edit .upcoming-delivery{
+        float: right;
+        margin-top: 6px;
+        font-size: 11px!important;
+    }
+    .worldpay-recurring-edit .upcoming-delivery.mobile{
+        display: none;
+    }
+    
+    .worldpay-recurring-edit .all-recurring-order-mobile{
+        display: none;
+    }
+    .worldpay-recurring-edit .all-recurring-order-desktop{
+        display: block;
+        float: right;
+        margin-top: 6px;
+    }
+    .modal-popup .modal-footer .add-new-btn {
+        float: left;
+    }
+}
+.worldpay-recurring-edit .change-shipping-address-modal .shipping-modal-body-content label,
+.worldpay-recurring-edit .change-shipping-address-modal .shipping-information-title span,
+.worldpay-recurring-edit .change-payment-method-modal .payment-modal-body-content .label{
+    font-weight: 600;
+}
+.worldpay-recurring-edit .change-shipping-address-modal #ship-address-dropdown,
+.worldpay-recurring-edit .change-shipping-address-modal .shipping-information-content{
+    margin-top: 8px;
+}
+.worldpay-recurring-edit .change-shipping-address-modal .successmsg,
+.worldpay-recurring-edit .change-payment-method-modal .successmsg{
+    color: #006400;;
+}
+.worldpay-recurring-edit .modal-popup .action-close{
+    display: none;
+}
+.worldpay-recurring-edit .modal-popup .modal-footer{
+    padding-bottom: 2rem;
+    padding-top: 2rem;
+}
+.worldpay-recurring-edit .modal-popup .modal-header h1{
+    color: #333;
+    font-weight: bold;
+    font-size:1em;
+    margin-top:-10px;
+}
+.worldpay-recurring-edit .modal-popup.modal-slide .modal-inner-wrap {
+    margin: 10rem auto;
+    height: auto!important;
+}
+.worldpay-recurring-edit .change-payment-method-modal .modal-content {
+    max-height: 35vh;
+    overflow: auto;
+}
+.worldpay-recurring-edit .change-payment-method-modal .paymentmethods-radio-wrapper{
+    margin: 10px 0;
+}
+.worldpay-recurring-edit .change-payment-method-modal .paymentmethods-radio-wrapper span.expired {
+    color: red;
+}
+.worldpay-recurring-edit #change-shipping-address,
+.worldpay-recurring-edit #change-payment-method {
+    cursor: pointer;
+}
+#change_shipping_modal .error,
+#change_payment_modal .error{
+    color:#ed0b02;
+}
+#change_shipping_modal .success,
+#change_payment_modal .success{
+    color: #008000;
+}
+.upcoming-delivery{
+    background: #eb5202;
+    color: white;
+    border-radius: 5px;
+    font-size: 9px;
+    padding: 2px 5px;
+    width: fit-content;
+    animation: blinker 2s linear infinite;
+}
+@keyframes blinker {
+    50% {
+      opacity: 0;
+    }
+}
\ No newline at end of file
diff --git a/view/frontend/web/images/samsungpay/pay-card-dark.png b/view/frontend/web/images/samsungpay/pay-card-dark.png
new file mode 100644
index 0000000..e66f9da
Binary files /dev/null and b/view/frontend/web/images/samsungpay/pay-card-dark.png differ
diff --git a/view/frontend/web/images/samsungpay/pay-card-ver-dark.png b/view/frontend/web/images/samsungpay/pay-card-ver-dark.png
new file mode 100644
index 0000000..a8d4ddf
Binary files /dev/null and b/view/frontend/web/images/samsungpay/pay-card-ver-dark.png differ
diff --git a/view/frontend/web/images/samsungpay/pay-card-ver.png b/view/frontend/web/images/samsungpay/pay-card-ver.png
new file mode 100644
index 0000000..744a818
Binary files /dev/null and b/view/frontend/web/images/samsungpay/pay-card-ver.png differ
diff --git a/view/frontend/web/images/samsungpay/pay-card.png b/view/frontend/web/images/samsungpay/pay-card.png
new file mode 100644
index 0000000..78ef943
Binary files /dev/null and b/view/frontend/web/images/samsungpay/pay-card.png differ
diff --git a/view/frontend/web/js/subscription.js b/view/frontend/web/js/subscription.js
new file mode 100644
index 0000000..a2c644b
--- /dev/null
+++ b/view/frontend/web/js/subscription.js
@@ -0,0 +1,303 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'uiComponent',
+    'underscore',
+    'jquery',
+    'Magento_Ui/js/modal/modal',
+    'ko',
+    'mage/storage',
+    'Magento_Catalog/js/price-utils'
+], function (Component,_, $,modal,ko,storage,priceUtils) {
+    'use strict';
+
+    return Component.extend({
+        pm_element: '',
+        sp_element: '',
+        sp_popelement: '',
+        pm_popelement: '',
+        isLoadingShippingMethod : ko.observable(false),
+        availableShippingMethods : ko.observableArray([]),
+        allAvailableShippingMethods : ko.observableArray([]),
+        availableTokens: ko.observableArray([]),
+        successmsg: ko.observable(),
+        msgColor: ko.observable('success'),
+        popupOptions: {
+            type: 'popup',
+            responsive: true,
+            clickableOverlay: false,
+            buttons: []
+        },
+        priceFormat :{
+            decimalSymbol: ".",
+            groupLength: 3,
+            groupSymbol: ",",
+            integerRequired: false,
+            pattern: "$%s",
+            precision: 2,
+            requiredPrecision: 2
+        },
+        shipmentApiUrl: 'rest/default/V1/worldpay/mine/estimate-recurring-shipping-methods',
+        shipmentUpdateApiUrl: 'rest/default/V1/worldpay/mine/update-recurring-shipment',
+        paymentTokenApiUrl: 'rest/default/V1/worldpay/mine/get-customer-payment-tokens',
+        updatePaymentTokenApiUrl: 'rest/default/V1/worldpay/mine/update-recurring-payment-token',
+        initialize: function () {
+            this._super();
+            this.pm_element = $(this.pm_elementId);
+            this.sp_element = $(this.sp_elementId);
+            this.sp_popelement = $(this.sp_popelement);
+            this.pm_popelement = $(this.pm_popelement);
+
+        },
+        closeModalPopup: function(){
+            var self = this;
+            self.sp_popelement.modal("closeModal");
+            window.location.reload();
+        },
+        closePaymentModalPopup: function(){
+            var self = this;
+            self.pm_popelement.modal("closeModal");
+            window.location.reload();
+        },
+        openShippingPopup: function(){
+            var self=this;
+            var popupdetails = self.popupOptions;
+            popupdetails.title = $.mage.__('Change Shipping Address');
+            popupdetails.modalClass = 'change-shipping-address-modal confirm';
+            popupdetails.buttons = [ {
+                text: $.mage.__('Add New Address'),
+                class: 'action-primary add-new-btn',
+                click: function (event) {
+                    window.location.href = '/customer/address/new/';                  
+                }
+            },{
+                text: $.mage.__('Save'),
+                class: 'action-primary',
+                click: function (event) {
+                    self.updateShipment();
+                }
+            },{
+                text: $.mage.__('Close'),
+                class: 'action-secondary',
+                click: function (event) {
+                    self.closeModalPopup();                    
+                }
+            }];
+            self.sp_popelement.modal(popupdetails).modal('openModal').on('modalclosed',function(){
+               window.location.reload();
+            });
+            $("#ship-address-dropdown").trigger('change');
+        },
+        getCartLabel: function(item){
+            var self = this;
+            var expiryCard = item.card_expiry_month+"/"+item.card_expiry_year;
+            return item.card_number+", "+expiryCard;
+        },
+        getCartLabelMessage: function(item){
+            var self = this;
+            var expiredMsg = '';
+
+            const currentDate = new Date();
+            const currentYear = currentDate.getFullYear();
+            const currentMonth = currentDate.getMonth() + 1; // January is 0, so we add 1
+          
+            // Convert expiryDate and expiryYear to a Date object
+            const expiry = new Date(`${item.card_expiry_year}-${item.card_expiry_month}-01`);
+
+            if (expiry < currentDate) {
+                expiredMsg = $.mage.__('Expired');
+            } else if (expiry.getFullYear() === currentYear && expiry.getMonth() + 1 === currentMonth) {
+                expiredMsg = $.mage.__('Expiring this month');
+            }
+            return expiredMsg;
+        },
+        updatePaymentToken: function(){
+            var self = this;
+            var selectedToken = $('input[name="available_recurring_tokens"]:checked').val();
+            if(typeof selectedToken == 'undefined'){
+                self.successmsg('Please select any card');
+                self.msgColor('error');
+                return false;
+            }
+            var obj ={
+                'tokenId': selectedToken,
+                'subscriptionId': self.current_subscription_id
+            };
+            $("body").trigger('processStart');
+            self.successmsg("");
+            storage.post(
+                self.updatePaymentTokenApiUrl, 
+                JSON.stringify(obj)
+            ).done(
+                function (response) {
+                    if(response.length){
+                        response = JSON.parse(response);
+                        self.successmsg(response.msg);
+                        self.msgColor('success');
+                    }
+                    $("body").trigger('processStop');
+                }
+            ).fail(
+                function (response) {
+                    console.log('Fail',response);
+                    $("body").trigger('processStop');
+                }
+            );
+        },        
+        openPaymentPopup: function(){
+            var self=this;
+            var popupdetails = self.popupOptions;
+            popupdetails.title = $.mage.__('Change Payment Method');
+            popupdetails.modalClass = 'change-payment-method-modal confirm';
+            popupdetails.buttons = [ {
+                text: $.mage.__('Add New Card'),
+                class: 'action-primary add-new-btn',
+                click: function (event) {
+                    window.location.href = '/worldpay/savedcard/addnewcard/';                  
+                }
+            },{
+                text: $.mage.__('Save'),
+                class: 'action-primary',
+                click: function (event) {
+                    self.updatePaymentToken();
+                }
+            },{
+                text: $.mage.__('Close'),
+                class: 'action-secondary',
+                click: function (event) {
+                    self.closePaymentModalPopup();                    
+                }
+            }];
+            self.pm_popelement.modal(popupdetails).modal('openModal').on('modalclosed',function(){
+                window.location.reload();
+            });
+            var obj = {
+            }
+            $("body").trigger('processStart');
+             storage.post(
+                    self.paymentTokenApiUrl, 
+                    JSON.stringify(obj)
+                ).done(
+                    function (response) {
+                        response = JSON.parse(response);
+                        var paymentMethodList = [];
+                        if(response.tokens){
+                            _.each(response.tokens,function(value){
+                                paymentMethodList.push({
+                                    "token_id": value.token_id,
+                                    "token_code": value.token_code,
+                                    "cardholder_name": value.cardholder_name,
+                                    "card_number": value.card_number,
+                                    "card_expiry_month": value.card_expiry_month,
+                                    "card_expiry_year": value.card_expiry_year
+                                });
+                            });
+                            self.availableTokens(paymentMethodList);
+
+                        }
+                        $("body").trigger('processStop');
+                    }
+                ).fail(
+                    function (response) {
+                        $("body").trigger('processStop');
+                    }
+                );
+            
+        },
+        getShippingMethodObj: function(selectedMethod){
+            var self = this;
+            var shipObj = "";
+            _.each(self.allAvailableShippingMethods(),function(value){
+                var identifier = value.carrier+'_'+value.method;
+                if(identifier == selectedMethod){
+                    shipObj = value;
+                }
+            });
+            return shipObj;
+        },
+        updateShipment: function(){
+            var self=this;
+            var addressId = $('#ship-address-dropdown').val();
+            var orderIncrementId = self.order_incrementId;
+            var selectedShippingMethod = $('input[name="shipping_method_recurring"]:checked').val();
+            if(typeof selectedShippingMethod == 'undefined'){
+                self.successmsg('Please select shipping method');
+                self.msgColor('error');
+                return false;
+            }
+            var shippingMethodObj = self.getShippingMethodObj(selectedShippingMethod);
+            var obj = {
+                shipmentData: {
+                        'orderIncrementId': orderIncrementId,
+                        'addressId': addressId,
+                        'shipping_method': shippingMethodObj,
+                        'subscription_id': self.current_subscription_id
+                   }
+            }
+            $(".ship-via").trigger('processStart');
+            storage.post(
+                self.shipmentUpdateApiUrl, 
+                JSON.stringify(obj)
+            ).done(
+                function (response) {
+                    if(response.length){
+                        response = JSON.parse(response);
+                        self.successmsg(response.msg);
+                        self.msgColor('success');
+                    }
+                    $(".ship-via").trigger('processStop');
+                }
+            ).fail(
+                function (response) {
+                    $(".ship-via").trigger('processStop');
+                }
+            );
+
+        },
+        fetchShippingMethodByAddress: function(){
+            var self=this;
+            var addressId = $('#ship-address-dropdown').val();
+            var orderIncrementId = self.order_incrementId;
+            var obj = {
+                'orderIncrementId': orderIncrementId,
+                'addressId': addressId
+            }
+            $(".ship-via").trigger('processStart');
+            $('.shipping-information-content').hide();
+             storage.post(
+                    self.shipmentApiUrl, 
+                    JSON.stringify(obj)
+                ).done(
+                    function (response) {
+                        response = JSON.parse(response);
+                        var shippingMethodList = [];
+                        if(response.length){
+                            self.allAvailableShippingMethods(response);
+                            _.each(response,function(value){
+                                var titledesc = priceUtils.formatPrice(value.cost, self.priceFormat)+' '+value.carrier_title+' - '+ value.method_title;
+                                shippingMethodList.push({
+                                    "identifier": value.carrier+'_'+value.method,
+                                    "label": titledesc,
+                                    "detail": value.method_title,
+                                    "amount": value.cost
+                                });
+                            });
+
+                            self.availableShippingMethods(shippingMethodList);
+                            $('.shipping-information-content').show();
+                        }
+                        $(".ship-via").trigger('processStop');
+                    }
+                ).fail(
+                    function (response) {
+                        console.log('Fail',response);
+                        $(".ship-via").trigger('processStop');
+                        $('.shipping-information-content').show();
+                    }
+                );
+        }
+    });
+});
\ No newline at end of file
diff --git a/view/frontend/web/js/view/payment/method-renderer/cc-method.js b/view/frontend/web/js/view/payment/method-renderer/cc-method.js
index f6e32e4..43686cf 100644
--- a/view/frontend/web/js/view/payment/method-renderer/cc-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/cc-method.js
@@ -943,35 +943,71 @@ define(
                     selectedCardType = this.selectedPayType();
                 }
 
-                return {
-                    'method': "worldpay_cc",
-                    'additional_data': {
-                        'cc_cid': this.creditCardVerificationNumber(),
-                        'cc_type': selectedCardType,
-                        'cc_exp_year': this.creditCardExpYear(),
-                        'cc_exp_month': this.creditCardExpMonth(),
-                        'cc_number': this.creditCardNumber(),
-                        'cc_name': $('#' + this.getCode() + '_cc_name').val(),
-                        'save_my_card': this.saveMyCard,
-                        'cse_enabled': this.isClientSideEncryptionEnabled(),
-                        'encryptedData': this.cseData,
-                        'tokenCode': this.paymentToken,
-                        'saved_cc_cid': $('.saved-cvv-number').val(),
-                        'isSavedCardPayment': this.isSavedCardPayment,
-                        'tokenization_enabled': this.isTokenizationEnabled(),
-                        'stored_credentials_enabled': this.isStoredCredentialsEnabled(),
-                        'dfReferenceId': window.sessionId,
-                        'disclaimerFlag': this.disclaimerFlag,
-                            'subscriptionStatus': this.isSubscribed(),
-                            'cpf_enabled': this.isCPFEnabled(),
-                            'instalment_enabled': this.isInstalmentEnabled(),
-                            'cpf': $('#' + this.getCode() + '_cpf').val(),
-                            'instalment': $('#' + this.getCode() + '_instalment').val(),
-                            'statement': this.statement,
-                            'shippingfee': this.getShippingFeeForBrazil(),
-                            'multishipping': this.multishipping
-                    }
-                };
+
+                if(this.isClientSideEncryptionEnabled()){
+                    return {
+                        'method': "worldpay_cc",
+                        'additional_data': {
+                            'cc_cid': this.creditCardVerificationNumber(),
+                            'cc_type': selectedCardType,
+                            'cc_exp_year': '',
+                            'cc_exp_month': '',
+                            'cc_number': '',
+                            'cc_name': $('#' + this.getCode() + '_cc_name').val(),
+                            'save_my_card': this.saveMyCard,
+                            'cse_enabled': this.isClientSideEncryptionEnabled(),
+                            'encryptedData': this.cseData,
+                            'tokenCode': this.paymentToken,
+                            'saved_cc_cid': $('.saved-cvv-number').val(),
+                            'isSavedCardPayment': this.isSavedCardPayment,
+                            'tokenization_enabled': this.isTokenizationEnabled(),
+                            'stored_credentials_enabled': this.isStoredCredentialsEnabled(),
+                            'dfReferenceId': window.sessionId,
+                            'disclaimerFlag': this.disclaimerFlag,
+                                'subscriptionStatus': this.isSubscribed(),
+                                'cpf_enabled': this.isCPFEnabled(),
+                                'instalment_enabled': this.isInstalmentEnabled(),
+                                'cpf': $('#' + this.getCode() + '_cpf').val(),
+                                'instalment': $('#' + this.getCode() + '_instalment').val(),
+                                'statement': this.statement,
+                                'shippingfee': this.getShippingFeeForBrazil(),
+                                'multishipping': this.multishipping
+                        }
+                    };
+
+                }else{
+                    return {
+                        'method': "worldpay_cc",
+                        'additional_data': {
+                            'cc_cid': this.creditCardVerificationNumber(),
+                            'cc_type': selectedCardType,
+                            'cc_exp_year': this.creditCardExpYear(),
+                            'cc_exp_month': this.creditCardExpMonth(),
+                            'cc_number': this.creditCardNumber(),
+                            'cc_name': $('#' + this.getCode() + '_cc_name').val(),
+                            'save_my_card': this.saveMyCard,
+                            'cse_enabled': this.isClientSideEncryptionEnabled(),
+                            'encryptedData': this.cseData,
+                            'tokenCode': this.paymentToken,
+                            'saved_cc_cid': $('.saved-cvv-number').val(),
+                            'isSavedCardPayment': this.isSavedCardPayment,
+                            'tokenization_enabled': this.isTokenizationEnabled(),
+                            'stored_credentials_enabled': this.isStoredCredentialsEnabled(),
+                            'dfReferenceId': window.sessionId,
+                            'disclaimerFlag': this.disclaimerFlag,
+                                'subscriptionStatus': this.isSubscribed(),
+                                'cpf_enabled': this.isCPFEnabled(),
+                                'instalment_enabled': this.isInstalmentEnabled(),
+                                'cpf': $('#' + this.getCode() + '_cpf').val(),
+                                'instalment': $('#' + this.getCode() + '_instalment').val(),
+                                'statement': this.statement,
+                                'shippingfee': this.getShippingFeeForBrazil(),
+                                'multishipping': this.multishipping
+                        }
+                    };
+                }
+
+                
             },
             isClientSideEncryptionEnabled:function(){
                 if (this.getCsePublicKey()) {
diff --git a/view/frontend/web/js/view/payment/samsungpay-checkout.js b/view/frontend/web/js/view/payment/samsungpay-checkout.js
index 8518035..cc358a6 100644
--- a/view/frontend/web/js/view/payment/samsungpay-checkout.js
+++ b/view/frontend/web/js/view/payment/samsungpay-checkout.js
@@ -102,6 +102,13 @@ return Component.extend({
             }
         }
         return true;
+    },
+    samsungPayButton: function(){
+        var paybuttonPath = window.checkoutConfig.payment.ccform.samsungPayButton;
+        if(!paybuttonPath){
+            paybuttonPath = 'pay-card';
+        }
+        return require.toUrl('Sapient_Worldpay/images/samsungpay/'+paybuttonPath+'.png');
     }
 });
 });
diff --git a/view/frontend/web/template/payment/wallets/samsungpay-checkout.html b/view/frontend/web/template/payment/wallets/samsungpay-checkout.html
index b15eb17..ca3d833 100644
--- a/view/frontend/web/template/payment/wallets/samsungpay-checkout.html
+++ b/view/frontend/web/template/payment/wallets/samsungpay-checkout.html
@@ -1,13 +1,15 @@
 <!-- ko if: ( isActive())-->
-    <div class="payment-samsungpay-checkout">
-        <form class="form" id="wp-samsung-pay-btn">
-            <fieldset>
-                <a href="javascript:void(0)" data-bind="
-                                    click: performPlaceOrder,
-                                    attr: {title: $t('Samsung Pay')}
-                                    "><img data-bind="attr: { src: require.toUrl('Sapient_Worldpay/images/cc/samsung-pay-button.svg') }" 
-                    alt="Samsung Pay" class="samsungpay-payment"></a>
-            </fieldset>
-        </form>
-    </div>
+<div class="payment-samsungpay-checkout">
+    <form class="form" id="wp-samsung-pay-btn">
+        <fieldset>
+            <a href="javascript:void(0)" 
+                    data-bind="
+                            click: performPlaceOrder,
+                            attr: {title: $t('Samsung Pay')}
+                            ">
+            <img data-bind="attr: { src: samsungPayButton() }" 
+            alt="Samsung Pay" class="samsungpay-payment responsive"></a>
+        </fieldset>
+    </form>
+</div>
 <!-- /ko -->
\ No newline at end of file