diff --git a/delivery_easypost_hibou/__manifest__.py b/delivery_easypost_hibou/__manifest__.py
index a27a069e..74bb30cd 100644
--- a/delivery_easypost_hibou/__manifest__.py
+++ b/delivery_easypost_hibou/__manifest__.py
@@ -10,6 +10,7 @@
         'delivery_hibou',
     ],
     'data': [
+        'views/delivery_carrier_views.xml',
     ],
     'demo': [
     ],
diff --git a/delivery_easypost_hibou/models/delivery_carrier.py b/delivery_easypost_hibou/models/delivery_carrier.py
index a42f1744..157f842f 100644
--- a/delivery_easypost_hibou/models/delivery_carrier.py
+++ b/delivery_easypost_hibou/models/delivery_carrier.py
@@ -1,14 +1,17 @@
 import requests
-from odoo import models, _
+from odoo import fields, models, _
 from odoo.exceptions import UserError
 from odoo.addons.delivery_easypost.models.easypost_request import EasypostRequest
-import logging
-_logger = logging.getLogger(__name__)
 
 
 class DeliveryCarrier(models.Model):
     _inherit = 'delivery.carrier'
 
+    easypost_return_method = fields.Selection([
+        ('ep', 'EasyPost Return'),
+        ('swap', 'Swap Addresses')
+    ], string='Return Method', default='ep')
+
     def easypost_send_shipping(self, pickings):
         """ It creates an easypost order and buy it with the selected rate on
         delivery method or cheapest rate if it is not set. It will use the
@@ -22,9 +25,14 @@ class DeliveryCarrier(models.Model):
         ep = EasypostRequest(self.sudo().easypost_production_api_key if self.prod_environment else self.sudo().easypost_test_api_key, self.log_xml)
         for picking in pickings:
             # Call Hibou delivery method to get picking type
-            is_return = superself._classify_picking(picking) in ('in', 'dropship_in',)
-            result = ep.send_shipping(self, picking.partner_id, picking.picking_type_id.warehouse_id.partner_id,
-                                      picking=picking, is_return=is_return)
+            if superself.easypost_return_method == 'ep':
+                is_return = superself._classify_picking(picking) in ('in', 'dropship_in',)
+                result = ep.send_shipping(self, picking.partner_id, picking.picking_type_id.warehouse_id.partner_id,
+                                          picking=picking, is_return=is_return)
+            else:
+                shipper = superself.get_shipper_warehouse(picking=picking)
+                recipient = superself.get_recipient(picking=picking)
+                result = ep.send_shipping(self, recipient, shipper, picking=picking)
             if result.get('error_message'):
                 raise UserError(_(result['error_message']))
             rate = result.get('rate')
diff --git a/delivery_easypost_hibou/views/delivery_carrier_views.xml b/delivery_easypost_hibou/views/delivery_carrier_views.xml
new file mode 100644
index 00000000..62bba7cf
--- /dev/null
+++ b/delivery_easypost_hibou/views/delivery_carrier_views.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="view_delivery_carrier_form_inherit_delivery_easypost_hibou" model="ir.ui.view">
+        <field name="name">delivery.carrier.form.inherit.delivery.easypost.hibou</field>
+        <field name="model">delivery.carrier</field>
+        <field name="inherit_id" ref="delivery_easypost.view_delivery_carrier_form_inherit_delivery_easypost"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='easypost_label_file_type']" position="after">
+                <field name="easypost_return_method" attrs="{'required': [('delivery_type', '=', 'easypost')]}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>