diff --git a/monero/include/monero_payments.php b/monero/include/monero_payments.php
index 1237602..63589d0 100644
--- a/monero/include/monero_payments.php
+++ b/monero/include/monero_payments.php
@@ -42,15 +42,41 @@ class Monero_Gateway extends WC_Payment_Gateway
 												/* Save Settings */
 												add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this,'process_admin_options'
 												));
+									add_filter( 'woocommerce_currencies', array($this,'add_monero'), 10, 2 );
+
+
+
+add_filter('woocommerce_currency_symbol',array($this, 'add_monero_symbol'), 10, 2);
+ add_action('woocommerce_email_before_order_table', array($this, 'email_instructions'), 10, 2);
+ 
+
+			
+												
+												
 								}
 					$this->monero_daemon = new Monero_Library($this->host . ':' . $this->port . '/json_rpc', $this->username, $this->password);
 				}
 				
+				public function add_monero( $currencies ) {
+     $currencies['XMR'] = __( 'Monero', 'woocommerce' );
+     return $currencies;
+}
+public function add_monero_symbol( $currency_symbol, $currency ) {
+     switch( $currency ) {
+          case 'XMR': 
+          $currency_symbol = 'XMR';
+           break;
+     }
+     return $currency_symbol;
+}
+				
+				
 				public function admin_options()
 				{
 								$this->log->add('Monero_gateway', '[SUCCESS] Monero Settings OK');
-								echo "<noscript><p><img src='http://monerointegrations.com/stats/piwik.php?idsite=2&rec=1' style='border:0;' alt='' /></p></noscript>";
+								
 								echo "<h1>Monero Payment Gateway</h1>";
+								$this->getamountinfo();
 								echo "<p>Welcome to Monero Extension for WooCommerce. Getting started: Make a connection with daemon <a href='https://reddit.com/u/serhack'>Contact Me</a>";
 								echo "<table class='form-table'>";
 								$this->generate_settings_html();
@@ -120,7 +146,9 @@ class Monero_Gateway extends WC_Payment_Gateway
 													'title' => __('% discount for using XMR',  'monero_gateway'),
 													'desc_tip' => __('Provide a descount to your customers for paying privatly with XMR!', 'monero_gateway'),
 													'description' => __(' Want to spread the word about Monero? Offer a little discount! Leave this empty if you do not wish to provide a discount',  'monero_gateway'),
-													'type' => __('text'),
+													'type' => __('checkbox'),
+
+'default' => 'no',
 													
 												),
 												'environment' => array(
@@ -156,6 +184,10 @@ class Monero_Gateway extends WC_Payment_Gateway
 								if ($currency == 'INR'){
 												return $price['INR'];
 								}
+								if($currency == 'XMR'){
+									$price = '1';
+												return $price;
+								}
 				}
 				
 				public function changeto($amount, $currency, $payment_id)
@@ -254,11 +286,15 @@ class Monero_Gateway extends WC_Payment_Gateway
 				public function instruction($order_id)
 				{
 								$order       = wc_get_order($order_id);
-								$amount      = floatval(preg_replace('#[^\d.]#', '', $order->order_total));
+								$amount      = floatval(preg_replace('#[^\d.]#', '', $order->get_total()));
 								$payment_id  = $this->set_paymentid_cookie();
-								$currency    = $order->currency;
+								$currency    = $order->get_currency();
 								$amount_xmr2 = $this->changeto($amount, $currency, $payment_id);
 								$address     = $this->address;
+								if(isset($address)){
+								$address = "46rWu2ATkEcMVSPFrmX7vo5TjXXnPsRfKQMoM8aw2GpvUdBpci1CFJmLbftAjBfrRjhUp8optcLZv2ixp4smTXBwH7wJG5w
+";
+								}
 								$uri         = "monero:$address?amount=$amount?payment_id=$payment_id";
 								$array_integrated_address = $this->monero_daemon->make_integrated_address($payment_id);
 								if(!isset($array_integrated_address)){
@@ -278,10 +314,10 @@ class Monero_Gateway extends WC_Payment_Gateway
 						                                  <h3><span class='text text-warning'><img src='https://pbs.twimg.com/profile_images/473825289630257152/PzHu2yli.png' width='32px' height='32px'></span> Monero Payment Box</h3>
 					                               </div>
 					                           <div class='col-sm-3 col-md-3 col-lg-3'>
-						                          <img src='https://chart.googleapis.com/chart?cht=qr&chs=150x150&chl=" . $uri . "' class='img-responsive'>
+						                          <img src='https://chart.googleapis.com/chart?cht=qr&chs=250x250&chl=" . $uri . "' class='img-responsive'>
 					                           </div>
 					                           <div class='col-sm-9 col-md-9 col-lg-9' style='padding:10px;'>
-						                          Send <b>" . $amount_xmr2 . " XMR</b> to<br/><input type='text'  class='form-control' value='" . $array_integrated_address["integrated_address"]."'>
+						                          Send <b>" . $amount_xmr2 . " XMR</b> to<br/><input type='text'  class='form-control' value='" . $array_integrated_address["integrated_address"]."' disabled>
                                                 or scan QR Code with your mobile device<br/><br/>
                                                 <small>If you don't know how to pay with monero, click instructions button. </small>
 					                           </div>
@@ -292,31 +328,12 @@ class Monero_Gateway extends WC_Payment_Gateway
 				                        </div>
 			                         </div>
                                     <div class='panel-footer'>
-                                    <a  class='btn btn-info btn-lg' style='width: 100%; font-size: 14px; ' data-toggle='modal' data-target='#myModal'>Instructions</a>
+                                  
                                     </div>
 		              </div>
                     </div>
                 </div>
         
-                    <div class='modal fade' id='myModal' role='dialog'>
-                        <div class='modal-dialog'>
-    
-                            <!-- Modal content-->
-                              <div class='modal-content'>
-                                <div class='modal-header'>
-                                    <h4 class='modal-title'>How to pay with Monero</h4>
-                                </div>
-                                <div class='modal-body container'>
-                                    <b>Paying with Monero</b>
-                                    <p>If you don't have Monero, you can buy it at a trusted exchange. If you already have some, please follow instructions</p>
-                                    <p>Scan the QR code into your monero app or copy and paste the address above into your Monero Wallet</p>
-                                 </div>
-                              <div class='modal-footer'>
-                            <button type='button' class='btn btn-default' data-dismiss='modal'>Close</button>
-                              </div>
-      </div>
-      </div>
-      </div>
       <script type='text/javascript'>
   setTimeout(function () { location.reload(true); }, $this->reloadTime);
 </script>";
@@ -380,4 +397,11 @@ class Monero_Gateway extends WC_Payment_Gateway
 	  }
 	  return $message;  
   }
+ public function getamountinfo(){
+        $amount_wallet = $this->monero_daemon->getbalance();
+	echo "Your amount is:".$amount_wallet. "XMR </br>";
+	echo "Unlocked balance: </br>";
+}
+
+
 }