diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c95c78..129c73d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 Changelog
 ---------
+3.3.0
+- Adicionada compatibilidade com One Step Checkout Brasil 6 Pro (Inovarti)
+
 3.2.2
 - Corrigido bug que não deixava visível o uso do checkout padrão/lightbox em alguns ambientes linux.
 
diff --git a/README.md b/README.md
index 0f2b81f..03a228f 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Com o módulo instalado e configurado, você pode pode oferecer o PagSeguro como
 
 - Certifique-se de que não há instalação de outros módulos para o PagSeguro em seu sistema;
 - Caso utilize a compilação do Magento, desative-a e limpe-a *(Sistema -> Ferramentas -> Compilação)*;
-- Baixe a última versão do módulo **[nesse link](https://github.com/pagseguro/magento/raw/master/UOL_PagSeguro-3.2.2.tgz)** ou então baixe o repositório como arquivo zip através do botão do GitHub;
+- Baixe a última versão do módulo **[nesse link](https://github.com/pagseguro/magento/raw/master/UOL_PagSeguro-3.3.0.tgz)** ou então baixe o repositório como arquivo zip através do botão do GitHub;
 - Na área administrativa do seu Magento, acesse o menu *Sistema/System -> Magento Connect -> Magento Connect Manager*. Caso tenha uma versão anterior do módulo instalada faça a remoção agora;
 - No Magento Connect Manger, dentro da seção Direct package file upload, clique em **Escolher arquivo/Choose file**, selecione o arquivo UOL_PagSeguro-x.x.x.tgz (baixado anteriormente), clique no botão de upload e acompanhe a instalação do módulo no console da página;
 - Caso utilize a compilação, volte para a área administrativa do Magento, ative-a e execute-a novamente;
diff --git a/UOL_PagSeguro-3.2.2.tgz b/UOL_PagSeguro-3.2.2.tgz
deleted file mode 100644
index 8feb47a..0000000
Binary files a/UOL_PagSeguro-3.2.2.tgz and /dev/null differ
diff --git a/UOL_PagSeguro-3.3.0.tgz b/UOL_PagSeguro-3.3.0.tgz
new file mode 100644
index 0000000..5e79de7
Binary files /dev/null and b/UOL_PagSeguro-3.3.0.tgz differ
diff --git a/app/code/community/UOL/PagSeguro/Block/Form/Boleto.php b/app/code/community/UOL/PagSeguro/Block/Form/Boleto.php
index e4bd30b..efa4899 100644
--- a/app/code/community/UOL/PagSeguro/Block/Form/Boleto.php
+++ b/app/code/community/UOL/PagSeguro/Block/Form/Boleto.php
@@ -1,23 +1,52 @@
 <?php
+
 /**
  * Form block for boleto payment
  */
 class UOL_PagSeguro_Block_Form_Boleto extends Mage_Payment_Block_Form
 {
-  protected function _construct()
-  {
-    parent::_construct();
-    $paymentModel = Mage::getSingleton('UOL_PagSeguro_Model_PaymentMethod');
-    $this->setBoletoSession($paymentModel->getSession());
-    $this->setTemplate('uol/pagseguro/form/boleto.phtml');
-  }
-  
-  protected function _prepareLayout()
-  { 
-    if ($this->getLayout()->getBlock('head')) {
-        $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/direct-payment.js');
-        $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/boleto.js');
-        $this->getLayout()->getBlock('head')->addItem('skin_css', 'uol/pagseguro/css/direct-payment.css');
+
+    protected function _construct()
+    {
+        parent::_construct();
+        $this->initializePagSeguro();
     }
-  }
-}
\ No newline at end of file
+
+    protected function _prepareLayout()
+    {
+        $paymentModel = Mage::getSingleton('UOL_PagSeguro_Model_PaymentMethod');
+        if ($paymentModel->getOneStepCheckoutIsEnabled()) {
+            $directPaymentCss = 'uol/pagseguro/css/direct-payment-onestepcheckout.css';
+        } else {
+            $directPaymentCss = 'uol/pagseguro/css/direct-payment.css';
+        }
+
+        if ($this->getLayout()->getBlock('head')) {
+            $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/direct-payment.js');
+            $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/boleto.js');
+            $this->getLayout()->getBlock('head')->addItem('skin_css', $directPaymentCss);
+        }
+    }
+
+    /**
+     * Set variables to be used in pagseguro boleto form (boleto.phtml)
+     */
+    private function initializePagSeguro()
+    {
+        $paymentModel = Mage::getSingleton('UOL_PagSeguro_Model_PaymentMethod');
+        if ($paymentModel->getOneStepCheckoutIsEnabled()) {
+            $this->setPagSeguroBeforeSaveJsSkinUrl($this->getSkinUrl('uol/pagseguro/js/pagseguro-onestepcheckout-before-save.js'));
+        } else {
+            $this->setPagSeguroBeforeSaveJsSkinUrl($this->getSkinUrl('uol/pagseguro/js/pagseguro-before-save.js'));
+        }
+        // if customer is loged, get his document info (taxvat)
+        if (Mage::getSingleton('customer/session')->isLoggedIn()) {
+            $customer = Mage::getSingleton('customer/session')->getCustomer();
+            $this->setBoletoDocument($customer->getData()['taxvat']);
+        }
+        // set boleto session
+        $this->setBoletoSession($paymentModel->getSession());
+        // set template
+        $this->setTemplate('uol/pagseguro/form/boleto.phtml');
+    }
+}
diff --git a/app/code/community/UOL/PagSeguro/Block/Form/CreditCard.php b/app/code/community/UOL/PagSeguro/Block/Form/CreditCard.php
index 9d8a143..0093ac7 100644
--- a/app/code/community/UOL/PagSeguro/Block/Form/CreditCard.php
+++ b/app/code/community/UOL/PagSeguro/Block/Form/CreditCard.php
@@ -4,23 +4,52 @@
  */
 class UOL_PagSeguro_Block_Form_CreditCard extends Mage_Payment_Block_Form
 {
-  protected function _construct()
-  {
-    parent::_construct();
-    $totals = Mage::getSingleton('checkout/session')->getQuote()->getTotals()['grand_total'];
-    $this->setGrandTotal($totals->getData()['value']);
-    
-    $paymentModel = Mage::getSingleton('UOL_PagSeguro_Model_PaymentMethod');
-    $this->setCreditCardSession($paymentModel->getSession());
-    $this->setTemplate('uol/pagseguro/form/creditcard.phtml');
-  }
+    protected function _construct()
+    {
+        parent::_construct();
+        $this->initializePagSeguro();
+    }
+
+    protected function _prepareLayout()
+    {
+        $paymentModel = Mage::getSingleton('UOL_PagSeguro_Model_PaymentMethod');
+        if ($paymentModel->getOneStepCheckoutIsEnabled()) {
+            $directPaymentCss = 'uol/pagseguro/css/direct-payment-onestepcheckout.css';
+        } else {
+            $directPaymentCss = 'uol/pagseguro/css/direct-payment.css';
+        }
+
+        if ($this->getLayout()->getBlock('head')) {
+            $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/direct-payment.js');
+            $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/credit-card.js');
+            $this->getLayout()->getBlock('head')->addItem('skin_css', $directPaymentCss);
+        }
+    }
+
+    /**
+     * Set variables to be used in pagseguro boleto form (boleto.phtml)
+     */
+    private function initializePagSeguro()
+    {
+        $totals = Mage::getSingleton('checkout/session')->getQuote()->getTotals()['grand_total'];
+        $this->setGrandTotal($totals->getData()['value']);
+
+        $paymentModel = Mage::getSingleton('UOL_PagSeguro_Model_PaymentMethod');
 
-  protected function _prepareLayout()
-  { 
-    if ($this->getLayout()->getBlock('head')) {
-        $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/direct-payment.js');
-        $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/credit-card.js');
-        $this->getLayout()->getBlock('head')->addItem('skin_css', 'uol/pagseguro/css/direct-payment.css');
+        if ($paymentModel->getOneStepCheckoutIsEnabled()) {
+            $this->setPagSeguroBeforeSaveJsSkinUrl($this->getSkinUrl('uol/pagseguro/js/pagseguro-onestepcheckout-before-save.js'));
+        } else {
+            $this->setPagSeguroBeforeSaveJsSkinUrl($this->getSkinUrl('uol/pagseguro/js/pagseguro-before-save.js'));
+        }
+        // if customer is loged, get his document info (taxvat)
+        if (Mage::getSingleton('customer/session')->isLoggedIn()) {
+            $customer = Mage::getSingleton('customer/session')->getCustomer();
+            $document = (is_null($customer->getData()['taxvat'])) ? '' : $customer->getData()['taxvat'];
+            $this->setCreditCardDocument($customer->getData()['taxvat']);
+        }
+        // set credit card session
+        $this->setCreditCardSession($paymentModel->getSession());
+        // set template
+        $this->setTemplate('uol/pagseguro/form/creditcard.phtml');
     }
-  }
 }
diff --git a/app/code/community/UOL/PagSeguro/Block/Form/OnlineDebit.php b/app/code/community/UOL/PagSeguro/Block/Form/OnlineDebit.php
index a0e7045..276ae65 100644
--- a/app/code/community/UOL/PagSeguro/Block/Form/OnlineDebit.php
+++ b/app/code/community/UOL/PagSeguro/Block/Form/OnlineDebit.php
@@ -4,20 +4,48 @@
  */
 class UOL_PagSeguro_Block_Form_OnlineDebit extends Mage_Payment_Block_Form
 {
-  protected function _construct()
-  {
-    parent::_construct();
-    $paymentModel = Mage::getSingleton('UOL_PagSeguro_Model_PaymentMethod');
-    $this->setOnlineDebitSession($paymentModel->getSession());
-    $this->setTemplate('uol/pagseguro/form/onlinedebit.phtml');
-  }
+    protected function _construct()
+    {
+        parent::_construct();
+        $this->initializePagSeguro();
+    }
+
+    protected function _prepareLayout()
+    {
+        $paymentModel = Mage::getSingleton('UOL_PagSeguro_Model_PaymentMethod');
+        if ($paymentModel->getOneStepCheckoutIsEnabled()) {
+            $directPaymentCss = 'uol/pagseguro/css/direct-payment-onestepcheckout.css';
+        } else {
+            $directPaymentCss = 'uol/pagseguro/css/direct-payment.css';
+        }
+
+        if ($this->getLayout()->getBlock('head')) {
+            $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/direct-payment.js');
+            $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/online-debit.js');
+            $this->getLayout()->getBlock('head')->addItem('skin_css', $directPaymentCss);
+        }
+    }
 
-  protected function _prepareLayout()
-  { 
-    if ($this->getLayout()->getBlock('head')) {
-        $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/direct-payment.js');
-        $this->getLayout()->getBlock('head')->addItem('skin_js', 'uol/pagseguro/js/online-debit.js');
-        $this->getLayout()->getBlock('head')->addItem('skin_css', 'uol/pagseguro/css/direct-payment.css');
+    /**
+     * Set variables to be used in pagseguro boleto form (boleto.phtml)
+     */
+    private function initializePagSeguro()
+    {
+        $paymentModel = Mage::getSingleton('UOL_PagSeguro_Model_PaymentMethod');
+        if ($paymentModel->getOneStepCheckoutIsEnabled()) {
+            $this->setPagSeguroBeforeSaveJsSkinUrl($this->getSkinUrl('uol/pagseguro/js/pagseguro-onestepcheckout-before-save.js'));
+        } else {
+            $this->setPagSeguroBeforeSaveJsSkinUrl($this->getSkinUrl('uol/pagseguro/js/pagseguro-before-save.js'));
+        }
+        // if customer is loged, get his document info (taxvat)
+        if (Mage::getSingleton('customer/session')->isLoggedIn()) {
+            $customer = Mage::getSingleton('customer/session')->getCustomer();
+            $document = (is_null($customer->getData()['taxvat'])) ? '' : $customer->getData()['taxvat'];
+            $this->setOnlineDebitDocument($customer->getData()['taxvat']);
+        }
+        // set onlinne debit session
+        $this->setOnlineDebitSession($paymentModel->getSession());
+        // set template
+        $this->setTemplate('uol/pagseguro/form/onlinedebit.phtml');
     }
-  }
 }
diff --git a/app/code/community/UOL/PagSeguro/Model/OrderAddress.php b/app/code/community/UOL/PagSeguro/Model/OrderAddress.php
index 7884b14..71b1490 100644
--- a/app/code/community/UOL/PagSeguro/Model/OrderAddress.php
+++ b/app/code/community/UOL/PagSeguro/Model/OrderAddress.php
@@ -46,15 +46,26 @@ public function getBillingAddress()
     private function setAddress(Mage_Sales_Model_Order_Address $address)
     {
         $response = new \PagSeguro\Domains\Address();
-        $parse = $this->parseStreet($address->getStreet1());
-        $response->setStreet($parse['street']);
-        $response->setNumber($parse['number']);
-        $response->setDistrict($address->getStreet2());
+        
+        if (count($address->getStreet()) === 4) {
+            //one step checkout default values
+            $response->setStreet($address->getStreet1());
+            $response->setNumber($address->getStreet2());
+            $response->setComplement($address->getStreet3());
+            $response->setDistrict($address->getStreet4());
+        } else {
+            //default configuration
+            $parse = $this->parseStreet($address->getStreet1());
+            $response->setStreet($parse['street']);
+            $response->setNumber($parse['number']);
+            $response->setDistrict($address->getStreet2());
+            $response->setComplement($address->getStreet3());
+        }
+
         $response->setCity($address->getCity());
         $response->setPostalCode($address->getPostcode());
         $response->setState($this->getRegionAbbreviation($address));
         $response->setCountry($address->getCountry());
-        $response->setComplement($address->getStreet3());
 
         return $response;
     }
diff --git a/app/code/community/UOL/PagSeguro/Model/PaymentMethod.php b/app/code/community/UOL/PagSeguro/Model/PaymentMethod.php
index edbaff3..457f701 100644
--- a/app/code/community/UOL/PagSeguro/Model/PaymentMethod.php
+++ b/app/code/community/UOL/PagSeguro/Model/PaymentMethod.php
@@ -117,13 +117,21 @@ private function payment($payment)
         $this->setItems($payment);
         $payment->setSender()->setName($this->order->getCustomerName());
         $payment->setSender()->setEmail($this->order->getCustomerEmail());
-        $phone = $this->helper->formatPhone($this->order->getShippingAddress()->getTelephone());
-        $payment->setSender()->setPhone()->withParameters($phone['areaCode'], $phone['number']);
-        $orderAddress = new UOL_PagSeguro_Model_OrderAddress($this->order);
-        $payment->setShipping()->setAddress()->instance($orderAddress->getShippingAddress());
-        $payment->setShipping()->setType()->withParameters(SHIPPING_TYPE);
-        $payment->setShipping()->setCost()->withParameters(number_format($this->order->getShippingAmount(), 2, '.',
-            ''));
+
+        if ($this->order->getShippingAddress() !== false) {
+            $orderAddress = new UOL_PagSeguro_Model_OrderAddress($this->order);
+            $payment->setShipping()->setAddress()->instance($orderAddress->getShippingAddress());
+            $payment->setShipping()->setType()->withParameters(SHIPPING_TYPE);
+            $payment->setShipping()->setCost()->withParameters(number_format($this->order->getShippingAmount(), 2, '.',
+                ''));
+            //set phone
+            if ($this->order->getShippingAddress()->getTelephone()) {
+                $phone = $this->helper->formatPhone($this->order->getShippingAddress()->getTelephone());
+                $payment->setSender()->setPhone()->withParameters($phone['areaCode'], $phone['number']);
+            }
+
+        }
+        
         $payment->setExtraAmount($this->order->getBaseDiscountAmount() + $this->order->getTaxAmount());
         $payment->setNotificationUrl($this->getNotificationURL());
 
@@ -282,4 +290,13 @@ public function getSession()
         }
         return $this->_session;
     }
+    
+    /**
+     * Return status (enabled or disabled) from the Inovarti One Step Checkout module
+     * @return boolean
+     */
+    public function getOneStepCheckoutIsEnabled()
+    {
+        return (Mage::getStoreConfig("onestepcheckout/general/is_enabled") == 1) ? true : false;
+    }
 }
diff --git a/app/code/community/UOL/PagSeguro/controllers/PaymentController.php b/app/code/community/UOL/PagSeguro/controllers/PaymentController.php
index 8025f5a..ee944f0 100644
--- a/app/code/community/UOL/PagSeguro/controllers/PaymentController.php
+++ b/app/code/community/UOL/PagSeguro/controllers/PaymentController.php
@@ -78,6 +78,12 @@ public function defaultAction()
         try {
             /** @var Mage_Sales_Model_Order $order */
             $order = Mage::getModel('sales/order')->load($this->getCheckout()->getLastOrderId());
+            
+            if(empty($order->getData())) {
+                $this->norouteAction();
+                return;
+            }
+            
             $this->payment->setOrder($order);
             /**
              * @var \PagSeguro\Domains\Requests\DirectPayment\Boleto|\PagSeguro\Domains\Requests\DirectPayment\CreditCard|\PagSeguro\Domains\Requests\DirectPayment\OnlineDebit $payment
@@ -119,6 +125,11 @@ public function directAction()
             /** @var Mage_Sales_Model_Order $order */
             $order = Mage::getModel('sales/order')->load($this->getCheckout()->getLastOrderId());
 
+            if(empty($order->getData())) {
+                $this->norouteAction();
+                return;
+            }
+
             $customerPaymentData = Mage::getSingleton('customer/session')->getData();
 
             $this->payment->setOrder($order);
@@ -173,6 +184,12 @@ public function lightboxAction()
         try {
             /** @var Mage_Sales_Model_Order $order */
             $order = Mage::getModel('sales/order')->load($this->getCheckout()->getLastOrderId());
+
+            if(empty($order->getData())) {
+                $this->norouteAction();
+                return;
+            }
+
             $this->payment->setOrder($order);
             /**
              * @var \PagSeguro\Domains\Requests\DirectPayment\Boleto|\PagSeguro\Domains\Requests\DirectPayment\CreditCard|\PagSeguro\Domains\Requests\DirectPayment\OnlineDebit $payment
diff --git a/app/code/community/UOL/PagSeguro/etc/config.xml b/app/code/community/UOL/PagSeguro/etc/config.xml
index f7d27a8..c312c55 100644
--- a/app/code/community/UOL/PagSeguro/etc/config.xml
+++ b/app/code/community/UOL/PagSeguro/etc/config.xml
@@ -19,7 +19,7 @@ limitations under the License.
 <config>
     <modules>
         <UOL_PagSeguro>
-            <version>3.2.2</version>
+            <version>3.3.0</version>
         </UOL_PagSeguro>
     </modules>
     <global>
diff --git a/app/design/frontend/base/default/layout/uol/pagseguro.xml b/app/design/frontend/base/default/layout/uol/pagseguro.xml
index 4dad35c..613b252 100644
--- a/app/design/frontend/base/default/layout/uol/pagseguro.xml
+++ b/app/design/frontend/base/default/layout/uol/pagseguro.xml
@@ -168,6 +168,12 @@ limitations under the License.
                    template="uol/pagseguro/loading.phtml"/>
         </reference>
     </checkout_onepage_index>
+    
+     <onestepcheckout_index_index>
+        <reference name="head">
+            <block type="uol_pagseguro/payment" name="loading" template="uol/pagseguro/loading.phtml"/>
+        </reference>
+     </onestepcheckout_index_index>
 
     <catalog_product_view>
         <reference name="head">
diff --git a/app/design/frontend/base/default/template/uol/pagseguro/form/boleto.phtml b/app/design/frontend/base/default/template/uol/pagseguro/form/boleto.phtml
index 0c219f3..ef55175 100644
--- a/app/design/frontend/base/default/template/uol/pagseguro/form/boleto.phtml
+++ b/app/design/frontend/base/default/template/uol/pagseguro/form/boleto.phtml
@@ -1,28 +1,40 @@
 <script type="text/javascript">
 //<![CDATA[
+    // get value fromm one step checkout guest document to be used in pagseguro direct payment
+    if(document.getElementById('billing:taxvat') !== null && document.getElementById('billing:taxvat').onchange === null) {
+        document.getElementById('billing:taxvat').onchange = function (){
+            var documents =  document.querySelectorAll('.pagseguro-document');
+            var i;
+            for (i=0; i < documents.length; i++) {
+                documents[i].value = document.getElementById('billing:taxvat').value;
+            }
+        }
+    }
+
+    //set pagseguro session
     setBoletoSessionId("<?= $this->getBoletoSession();?>");
-    assignBoletoHash();
 //]]>
 </script>
     
 <script type="text/javascript">
 //<![CDATA[
-var x = document.getElementsByTagName("script");
-  var header_already_added = false;
-  for (var i=0; i< x.length; i++){
-      if (x[i].src == "<?php echo $this->getSkinUrl('uol/pagseguro/js/pagseguro-before-save.js') ?>"){
-             header_already_added = true;
-      }
-  }
+    var beforeSaveJsUrl = "<?php echo $this->getPagSeguroBeforeSaveJsSkinUrl() ?>";
+    var x = document.getElementsByTagName("script");
+    var header_already_added = false;
+    for (var i=0; i< x.length; i++){
+        if (x[i].src == beforeSaveJsUrl){
+            header_already_added = true;
+        }
+    }
 
-  if (header_already_added == false){
-    // add header if not already added
-    var head = document.getElementsByTagName("head")[0];
-    var s = document.createElement('script');
-    s.type = 'text/javascript';
-    s.src = '<?php echo $this->getSkinUrl('uol/pagseguro/js/pagseguro-before-save.js') ?>';
-    head.appendChild(s);
-  }
+    if (header_already_added == false){
+      // add header if not already added
+      var head = document.getElementsByTagName("head")[0];
+      var s = document.createElement('script');
+      s.type = 'text/javascript';
+      s.src = beforeSaveJsUrl;
+      head.appendChild(s);
+    }
 //]]>
 </script>
 
@@ -30,18 +42,18 @@ var x = document.getElementsByTagName("script");
     <input type="hidden" id="boletoHash" value="" name="payment[boleto_hash]">
     <div style="float: left">
         <div class="pagseguro-boleto-label-div">
-            <label class="pagseguro-required" ><?php echo $this->__('CPF ou CNPJ') ?></label>
+            <label class="pagseguro-required required-entry" ><?php echo $this->__('CPF ou CNPJ') ?></label>
         </div>
         <div class="pagseguro-cc-input-div">
             <input 
-                class="pagseguro-cc-input" 
+                class="pagseguro-cc-input pagseguro-document required-entry" 
                 id="bilitDocument"  
                 onblur="validateDocument(this)" 
                 onkeydown="documentMask(this)"
                 type="text" 
                 title="<?php echo $this->__('CPF ou CNPJ') ?>" 
                 name="payment[boleto_cpf]" 
-                value="" 
+                value="<?= $this->getBoletoDocument() ?>" 
                 maxlength="18"
             />
             <div class="display-none validation-advice bilitDocument-error-message">Insira um CPF ou CNPJ válido</div>
diff --git a/app/design/frontend/base/default/template/uol/pagseguro/form/creditcard.phtml b/app/design/frontend/base/default/template/uol/pagseguro/form/creditcard.phtml
index 34279d4..70555b2 100644
--- a/app/design/frontend/base/default/template/uol/pagseguro/form/creditcard.phtml
+++ b/app/design/frontend/base/default/template/uol/pagseguro/form/creditcard.phtml
@@ -1,16 +1,28 @@
 <script type="text/javascript">
 //<![CDATA[
+    // get value from one step checkout guest (if it is enabled) document to be used in pagseguro direct payment
+    if(document.getElementById('billing:taxvat') !== null && document.getElementById('billing:taxvat').onchange === null) {
+        document.getElementById('billing:taxvat').onchange = function (){
+            var documents =  document.querySelectorAll('.pagseguro-document');
+            var i;
+            for (i=0; i < documents.length; i++) {
+                documents[i].value = document.getElementById('billing:taxvat').value;
+            }
+        }
+    }
+
+    //set pagseguro credit card session
     setCreditCardSessionId("<?= $this->getCreditCardSession(); ?>");
-    assignCreditCardHash();
 //]]>
 </script>
 
 <script>
 //<![CDATA[
+    var beforeSaveJsUrl = "<?php echo $this->getPagSeguroBeforeSaveJsSkinUrl() ?>";
     var x = document.getElementsByTagName("script");
     var header_already_added = false;
     for (var i=0; i< x.length; i++){
-      if (x[i].src == "<?php echo $this->getSkinUrl('uol/pagseguro/js/pagseguro-before-save.js') ?>"){
+      if (x[i].src == beforeSaveJsUrl){
              header_already_added = true;
     }
   }
@@ -20,7 +32,7 @@
     var head = document.getElementsByTagName("head")[0];
     var s = document.createElement('script');
     s.type = 'text/javascript';
-    s.src = '<?php echo $this->getSkinUrl('uol/pagseguro/js/pagseguro-before-save.js') ?>';
+    s.src = beforeSaveJsUrl;
     head.appendChild(s);
   }
 //]]>
@@ -39,7 +51,7 @@
             <label class="pagseguro-required" for="creditCardNum">Número do cartão</label>
         </div>
         <div class="pagseguro-cc-input-div">
-            <input class="pagseguro-cc-input" type="text" id="creditCardNum" onkeydown="creditCardMask(this)" onblur="getBrand(this)" maxlength="19">
+            <input class="pagseguro-cc-input required-entry" type="text" id="creditCardNum" onkeydown="creditCardMask(this)" onblur="getBrand(this)" maxlength="19">
             <div class="display-none validation-advice creditCardNum-error-message">Insira um número de cartão válido</div>
         </div>
     </div>
@@ -49,7 +61,7 @@
             <label class="pagseguro-required" for="creditCardHolder">Nome impresso no cartão</label>
         </div>
         <div class="pagseguro-cc-input-div">
-            <input class="pagseguro-cc-input" type="text" name="payment[credit_card_holder]" id="creditCardHolder" required onblur="validateCardHolder(this)" onkeydown="notNumberMask(this)" minlength="3">
+            <input class="pagseguro-cc-input required-entry" type="text" name="payment[credit_card_holder]" id="creditCardHolder" required onblur="validateCardHolder(this)" onkeydown="notNumberMask(this)" minlength="3">
             <div class="display-none validation-advice creditCardHolder-error-message">Insira um nome</div>
         </div>
     </div>
@@ -59,7 +71,7 @@
         <label class="pagseguro-required" for="creditCardExpirationMonth">Validade</label>
         </div>
         <div class="pagseguro-cc-input-div">
-            <select onclick="validateCreditCardMonth(this)" id="creditCardExpirationMonth" title="Cartão válido até" class="pagseguro-cc-select" required>
+            <select onclick="validateCreditCardMonth(this)" id="creditCardExpirationMonth" title="Cartão válido até" class="pagseguro-cc-select required-entry" required>
                 <option value="" disabled selected>Mês</option>
                 <option value="01">01</option>
                 <option value="02">02</option>
@@ -75,7 +87,7 @@
                 <option value="12">12</option>
             </select>
             <div class="display-none validation-advice creditCardExpirationMonth-error-message">Escolha um mês</div>
-            <select onclick="validateCreditCardYear(this)" id="creditCardExpirationYear" title="Cartão válido até" class="pagseguro-cc-select" required>
+            <select onclick="validateCreditCardYear(this)" id="creditCardExpirationYear" title="Cartão válido até" class="pagseguro-cc-select required-entry" required>
                 <option value="" disabled selected>Ano</option>
                 <?php
                 $year = idate("Y");
@@ -93,7 +105,7 @@
             <label class="pagseguro-required" for="creditCardCode">Código de segurança</label>
         </div>
         <div class="pagseguro-cc-input-div">
-            <input class="pagseguro-cc-input form-control code-card-mask" id="creditCardCode" type="text" minlength="3"
+            <input class="pagseguro-cc-input form-control code-card-mask required-entry" id="creditCardCode" type="text" minlength="3"
                    maxlength="4"
                    onkeydown="creditCardCodeMask(this)"
                    onblur="validateCreditCardCode(this, true)" required>
@@ -108,13 +120,13 @@
         <div class="pagseguro-cc-input-div">
             <input
                 id="creditCardDocument"
-                class="pagseguro-cc-input"
+                class="pagseguro-cc-input pagseguro-document required-entry"
                 onblur="validateDocument(this)"
                 onkeydown="documentMask(this)"
                 type="text"
                 title="<?php echo $this->__('CPF ou CNPJ') ?>"
                 name="payment[credit_card_cpf]"
-                value=""
+                value="<?= $this->getCreditCardDocument() ?>" 
                 maxlength="18"
             />
             <div class="display-none validation-advice creditCardDocument-error-message">Insira um CPF ou CNPJ válido</div>
@@ -126,7 +138,7 @@
         <label class="pagseguro-required" for="creditCardHolderBirthdate">Data de nascimento</label>
         </div>
         <div class="pagseguro-cc-input-div">
-            <input maxlength="10" type="text" name="payment[credit_card_holder_birthdate]" class="form-control date-mask pagseguro-cc-input" id="creditCardHolderBirthdate" required
+            <input maxlength="10" type="text" name="payment[credit_card_holder_birthdate]" class="form-control date-mask pagseguro-cc-input required-entry" id="creditCardHolderBirthdate" required
                    placeholder="dd/mm/aaaa" onblur="validateCreditCardHolderBirthdate(this)" onkeydown="MascaraData(this)">
             <div class="display-none validation-advice creditCardHolderBirthdate-error-message">Insira uma data de nascimento válida</div>
         </div>
@@ -137,7 +149,7 @@
             <label class="pagseguro-required" for="card_installments">Parcelas</label>
         </div>
         <div class="pagseguro-cc-input-div">
-            <select class="pagseguro-cc-select" id="card_installment_option" title="Nº de parcelas" required
+            <select class="pagseguro-cc-select required-entry" id="card_installment_option" title="Nº de parcelas" required
                     disabled onchange="cardInstallmentOnChange(this.value)" onclick="validateCreditCardInstallment(this)">
                 <option value="null" disabled selected>Escolha o N° de parcelas</option>
             </select>
diff --git a/app/design/frontend/base/default/template/uol/pagseguro/form/onlinedebit.phtml b/app/design/frontend/base/default/template/uol/pagseguro/form/onlinedebit.phtml
index d1baab1..7c39e8a 100644
--- a/app/design/frontend/base/default/template/uol/pagseguro/form/onlinedebit.phtml
+++ b/app/design/frontend/base/default/template/uol/pagseguro/form/onlinedebit.phtml
@@ -1,16 +1,28 @@
 <script type="text/javascript">
 //<![CDATA[
+    // get value from one step checkout guest (if it is enabled) document to be used in pagseguro direct payment
+    if(document.getElementById('billing:taxvat') !== null && document.getElementById('billing:taxvat').onchange === null) {
+        document.getElementById('billing:taxvat').onchange = function (){
+            var documents =  document.querySelectorAll('.pagseguro-document');
+            var i;
+            for (i=0; i < documents.length; i++) {
+                documents[i].value = document.getElementById('billing:taxvat').value;
+            }
+        }
+    }
+
+    //set pagseguro session
     setOnlineDebitSessionId("<?= $this->getOnlineDebitSession();?>");
-    assignOnlineDebitHash();
 //]]>
 </script>
 
 <script>
 //<![CDATA[
+    var beforeSaveJsUrl = "<?php echo $this->getPagSeguroBeforeSaveJsSkinUrl() ?>";
     var x = document.getElementsByTagName("script");
       var header_already_added = false;
     for (var i=0; i< x.length; i++){
-      if (x[i].src == "<?php echo $this->getSkinUrl('uol/pagseguro/js/pagseguro-before-save.js') ?>"){
+      if (x[i].src == beforeSaveJsUrl){
              header_already_added = true;
       }
   }
@@ -20,7 +32,7 @@
     var head = document.getElementsByTagName("head")[0];
     var s = document.createElement('script');
     s.type = 'text/javascript';
-    s.src = '<?php echo $this->getSkinUrl('uol/pagseguro/js/pagseguro-before-save.js') ?>';
+    s.src = beforeSaveJsUrl;
     head.appendChild(s);
   }
 //]]>
@@ -38,13 +50,13 @@
         <div class="pagseguro-cc-input-div">
             <input 
                 id="debitDocument"
-                class="input-text"
+                class="input-text pagseguro-document required-entry"
                 onblur="validateDocument(this)"
                 onkeydown="documentMask(this)"
                 type="text"
                 title="<?php echo $this->__('CPF ou CNPJ') ?>"
                 name="payment[online_debit_cpf]"
-                value=""
+                value="<?= $this->getOnlineDebitDocument() ?>"
                 maxlength="18"
             />
             <div class="display-none validation-advice debitDocument-error-message">Insira um CPF ou CNPJ válido</div>
@@ -55,7 +67,7 @@
             <div>
                 <div>
                     <label>
-                        <input class="input-radio" type="radio" id="debitbankName" name="debitbankName" value="itau"
+                        <input class="input-radio required-entry" type="radio" id="debitbankName" name="debitbankName" value="itau"
                                required onclick="validateDebitBankName(this)">
                         Itaú
                     </label>
@@ -64,7 +76,7 @@
             <div>
                 <div>
                     <label>
-                        <input class="input-radio" type="radio" id="debitbankName" name="debitbankName" value="bradesco"
+                        <input class="input-radio required-entry" type="radio" id="debitbankName" name="debitbankName" value="bradesco"
                                required onclick="validateDebitBankName(this)">
                         Bradesco
                     </label>
@@ -73,7 +85,7 @@
             <div>
                 <div>
                     <label>
-                        <input class="input-radio" type="radio" id="debitbankName" name="debitbankName" value="banrisul"
+                        <input class="input-radio required-entry" type="radio" id="debitbankName" name="debitbankName" value="banrisul"
                                required onclick="validateDebitBankName(this)">
                         Banrisul
                     </label>
@@ -82,7 +94,7 @@
             <div>
                 <div>
                     <label>
-                        <input class="input-radio" type="radio" id="debitbankName" name="debitbankName"
+                        <input class="input-radio required-entry" type="radio" id="debitbankName" name="debitbankName"
                                value="bancodobrasil" onclick="validateDebitBankName(this)">
                         Banco do Brasil
                     </label>
diff --git a/skin/frontend/base/default/uol/pagseguro/css/direct-payment-onestepcheckout.css b/skin/frontend/base/default/uol/pagseguro/css/direct-payment-onestepcheckout.css
new file mode 100644
index 0000000..ac2cbbe
--- /dev/null
+++ b/skin/frontend/base/default/uol/pagseguro/css/direct-payment-onestepcheckout.css
@@ -0,0 +1,93 @@
+.display-none {
+  display: none;
+}
+
+.help-block {
+    color: #df280a;
+    font-size: small;
+}
+
+.pagseguro-label-spacing {
+    padding: 0.5em 0em;
+    /*display: inline-flex;*/
+}
+
+.pagseguro-label-width {
+    width: 30%;
+}
+
+.pagseguro-input-width {
+    width: 50%;
+}
+
+span > input {
+    width: 50%;
+}
+
+.pagseguro-label-spacing > label {
+    width: 30%;
+    text-align: right;
+}
+
+.pagseguro-direct-payment-ul {
+    padding: 0.9em 0em 0.1em;
+    font-size: smaller;
+    font-style: italic;
+}
+
+.flag-origin-country-img {
+    position: absolute; 
+    padding-left: 0.5em;
+    display: inline;
+}
+
+.pagseguro-cc-group-div {
+    position: relative;
+    width: 100%;
+    display: inline-block;
+}
+
+.pagseguro-cc-label-div {
+    float: left; 
+    width: 100%;
+    text-align: left;
+    padding-right: 4px;
+}
+
+.pagseguro-cc-input-div {
+    float: left;
+    width: 100%;
+}
+
+.pagseguro-required:after {
+    content: '*';
+    color: #df280a;
+    font-weight: normal;
+    font-family: "Helvetica Neue", Verdana, Arial, sans-serif;
+    font-size: 11px;
+}
+
+.pagseguro-cc-input {
+    border: 1px solid silver;
+}
+
+.pagseguro-cc-select{
+    border: 1px solid silver;
+    height: 30px;
+    padding: 0 8px;
+    font-size: 13px;
+}
+
+.pagseguro-boleto-label-div {
+    float: left;
+    text-align: right;
+    padding-right: 4px;
+}
+
+label.required:after {
+    content: '*';
+    color: #df280a;
+    font-weight: normal;
+    font-family: "Helvetica Neue", Verdana, Arial, sans-serif;
+    font-size: 11px;
+}
\ No newline at end of file
diff --git a/skin/frontend/base/default/uol/pagseguro/js/boleto.js b/skin/frontend/base/default/uol/pagseguro/js/boleto.js
index 27af1c1..3d3be62 100644
--- a/skin/frontend/base/default/uol/pagseguro/js/boleto.js
+++ b/skin/frontend/base/default/uol/pagseguro/js/boleto.js
@@ -7,13 +7,14 @@ function getSenderHash () {
 }
 
 function assignBoletoHash () {
-    setTimeout(function () {
-        document.getElementById('boletoHash').value = getSenderHash()
-    }, 500)
+  setTimeout(function () {
+    document.getElementById('boletoHash').value = getSenderHash()
+  }, 500)
 }
 
 function validateBoletoForm () {
   if (validateDocument(document.querySelector('#bilitDocument'))) {
+    document.getElementById('boletoHash').value = getSenderHash();
     return true;
   }
 
diff --git a/skin/frontend/base/default/uol/pagseguro/js/credit-card.js b/skin/frontend/base/default/uol/pagseguro/js/credit-card.js
index 2816a79..a0e703d 100644
--- a/skin/frontend/base/default/uol/pagseguro/js/credit-card.js
+++ b/skin/frontend/base/default/uol/pagseguro/js/credit-card.js
@@ -157,19 +157,19 @@ function validateCreditCardCode(self, createToken) {
 
 function validateCreditCardForm() {
   if (
-   validateCreditCard(document.querySelector('#creditCardNum')) &&
-   validateDocument(document.querySelector('#creditCardDocument')) &&
-   validateCardHolder(document.querySelector('#creditCardHolder')) &&
-   validateCreditCardHolderBirthdate(document.querySelector('#creditCardHolderBirthdate')) &&
-   validateCreditCardMonth(document.querySelector('#creditCardExpirationMonth')) &&
-   validateCreditCardYear(document.querySelector('#creditCardExpirationYear')) &&
-   validateCreditCardCode(document.querySelector('#creditCardCode'), false) &&
-   validateCreditCardInstallment(document.querySelector('#card_installment_option'))
+    validateCreditCard(document.querySelector('#creditCardNum')) &&
+    validateDocument(document.querySelector('#creditCardDocument')) &&
+    validateCardHolder(document.querySelector('#creditCardHolder')) &&
+    validateCreditCardHolderBirthdate(document.querySelector('#creditCardHolderBirthdate')) &&
+    validateCreditCardMonth(document.querySelector('#creditCardExpirationMonth')) &&
+    validateCreditCardYear(document.querySelector('#creditCardExpirationYear')) &&
+    validateCreditCardCode(document.querySelector('#creditCardCode'), false) &&
+    validateCreditCardInstallment(document.querySelector('#card_installment_option'))
   ) {
-
-   if (document.getElementById('creditCardToken').value === "") {
-     createCardToken();
-   }
+    document.getElementById('creditCardHash').value = getSenderHash();
+    if (document.getElementById('creditCardToken').value === "" || document.getElementById('creditCardToken').value == "undefined") {
+      createCardToken();
+    }
    return true;
   }
   
diff --git a/skin/frontend/base/default/uol/pagseguro/js/online-debit.js b/skin/frontend/base/default/uol/pagseguro/js/online-debit.js
index 2d1f7df..ae29452 100644
--- a/skin/frontend/base/default/uol/pagseguro/js/online-debit.js
+++ b/skin/frontend/base/default/uol/pagseguro/js/online-debit.js
@@ -1,10 +1,22 @@
 function validateDebitBankName(self) {
-  document.getElementById('onlineDebitBankName').value = self.value;
   if (!self.validity.valid) {
     displayError(self)
     return false
   } else {
     displayError(self, false)
+    
+    var radioBankInputs =  document.querySelectorAll('#debitbankName');
+    var i;
+    for (i=0; i < radioBankInputs.length; i++) {
+        if (radioBankInputs[i].checked) {
+          document.getElementById('onlineDebitBankName').value = radioBankInputs[i].value;
+        }
+        // one time selected it will be already select, so they don't need more to be required entry
+        radioBankInputs[i].classList.remove('required-entry');
+        // remove One Step Checkout observer from calling everytime a bank is selected
+        radioBankInputs[i].stopObserving('blur');
+    }
+
     return true
   }
 }
@@ -25,7 +37,9 @@ function assignOnlineDebitHash() {
 
 function validateDebitForm() {
   if (validateDocument(document.getElementById('debitDocument')) &&
-          validateDebitBankName(document.getElementById('debitbankName'))) {
+    validateDebitBankName(document.getElementById('debitbankName'))
+  ) {
+    document.getElementById('onlineDebitHash').value = getSenderHash()
     return true;
   }
 
diff --git a/skin/frontend/base/default/uol/pagseguro/js/pagseguro-before-save.js b/skin/frontend/base/default/uol/pagseguro/js/pagseguro-before-save.js
index 96de863..aad462f 100644
--- a/skin/frontend/base/default/uol/pagseguro/js/pagseguro-before-save.js
+++ b/skin/frontend/base/default/uol/pagseguro/js/pagseguro-before-save.js
@@ -4,7 +4,7 @@ Payment.prototype.save = Payment.prototype.save.wrap(function(save) {
   if (this.validate() && validator.validate()) {
     // Do form validations
     if (validatePagSeguroActiveMethod()) {
-      save();
+      return save();
     }
   }
 });
@@ -14,7 +14,8 @@ Payment.prototype.save = Payment.prototype.save.wrap(function(save) {
  * @returns {Boolean}
  */
 function validatePagSeguroActiveMethod() {
-  switch (payment.currentMethod) {
+  //payment.currentMethod
+  switch (document.querySelector('#checkout-payment-method-load .radio:checked').value) {
     case "pagseguro_credit_card":
       return validateCreditCardForm();
       break;
diff --git a/skin/frontend/base/default/uol/pagseguro/js/pagseguro-onestepcheckout-before-save.js b/skin/frontend/base/default/uol/pagseguro/js/pagseguro-onestepcheckout-before-save.js
new file mode 100644
index 0000000..d69c0bd
--- /dev/null
+++ b/skin/frontend/base/default/uol/pagseguro/js/pagseguro-onestepcheckout-before-save.js
@@ -0,0 +1,96 @@
+/**
+ * Call events before magento OneSstepChekouPayment switchToMethod event - only call
+ * when the type of payment selected is relative to PagSeguro methods, preventing to
+ * save all the time a PagSeguro Method is selected
+ * @type OnestepcheckoutShipment
+ */
+OnestepcheckoutShipment.prototype.switchToMethod = OnestepcheckoutShipment.prototype.switchToMethod.wrap(
+  function(switchToMethod, methodCode, forced){
+    if (isPagSeguroCurrentPaymentMethod() && forced === true) {
+      return false; //do nothing
+    }
+
+    // normal flow
+    return switchToMethod(methodCode, forced);
+  });
+
+/**
+ * Observer for checkout price modifications, like changes in shipment price or taxes
+ * to call the installments value with the updated value
+ * @object OnestepcheckoutForm.hidePriceChangeProcess
+ * 
+ */
+OnestepcheckoutForm.prototype.hidePriceChangeProcess = OnestepcheckoutForm.prototype.hidePriceChangeProcess.wrap(function(hidePriceChangeProcess){
+    var granTotalAmountUpdated = convertPriceStringToFloat(this.granTotalAmount.textContent);
+    
+    if (document.getElementById('grand_total') !== null && parseFloat(document.getElementById('grand_total').value) !== granTotalAmountUpdated) {
+      document.getElementById('grand_total').value = granTotalAmountUpdated;
+      if (document.getElementById('creditCardNum') !== null && document.getElementById('creditCardNum').value.length > 6) {
+        getInstallments(document.getElementById('creditCardBrand').value);
+      }
+    }
+ 
+    return hidePriceChangeProcess();
+});
+
+//call pagseguro validation events before magento OneStepChekouPayment validate event, before finish checkout
+OnestepcheckoutForm.prototype.validate = OnestepcheckoutForm.prototype.validate.wrap(function(validate){
+    if (validatePagSeguroActiveMethod()) {
+      return validate();
+    }
+});
+
+/**
+ * Validate the active payment method before magento save payment
+ * @returns {Boolean}
+ */
+function validatePagSeguroActiveMethod() {
+  //OSCPayment.currentMethod
+  switch (document.querySelector('#checkout-payment-method-load .radio:checked').value) {
+    case "pagseguro_credit_card":
+      return validateCreditCardForm();
+      break;
+    case "pagseguro_boleto":
+      return validateBoletoForm();
+      break;
+    case "pagseguro_online_debit":
+      return validateDebitForm();
+      break;
+    case "pagseguro_default_lightbox":
+      return true;
+      break;
+    default:
+      return true;
+      break;
+  }
+}
+
+/**
+ * Converts an brazilian real price string, like R$9,99, or 9,99, to float (9.99)
+ * @param {string} priceString
+ * @returns {float}
+ */
+function convertPriceStringToFloat(priceString){    
+  if(priceString === ""){
+    priceString =  0;
+  }else{
+    priceString = priceString.replace("R$","");
+    priceString = priceString.replace(".","");
+    priceString = priceString.replace(",",".");
+    priceString = parseFloat(priceString);
+  }
+  return priceString;
+}
+
+/**
+ * Return if is selected an PagSeguro Payment Method as a current payment method
+ * in the checkout payment section
+ * @returns {bolean}
+ */
+function isPagSeguroCurrentPaymentMethod() {
+  currentPaymentMethod = document.querySelector('input[name="payment[method]"]:checked').value;
+  return (currentPaymentMethod === 'pagseguro_credit_card'
+    || currentPaymentMethod === 'pagseguro_boleto'
+    || currentPaymentMethod === 'pagseguro_online_debit'
+    || currentPaymentMethod === 'pagseguro_default_lightbox');
+}
\ No newline at end of file