diff --git a/assets/js/checkout-fields.js b/assets/js/checkout-fields.js
index 34ad9ed..99a1d32 100644
--- a/assets/js/checkout-fields.js
+++ b/assets/js/checkout-fields.js
@@ -1,20 +1,6 @@
 jQuery( document ).ready(function ($) {
 
 
-	if(!document.getElementById( 'billing_number' )){
-		$( "#billing_address_2_field" ).removeClass( "form-row-wide" ).addClass( "form-row-first" );
-		$( "#billing_address_2_field > label" ).removeClass( "screen-reader-text" ).html( "Complemento" );
-
-		let newNode = $( "<p></p>" )
-		newNode.addClass( "form-row form-row-last validate-required" );
-		newNode.html( '<label for="gn_billing_number" class="">Número <abbr class="required" title="obrigatório">*</abbr></label><span class="woocommerce-input-wrapper"><input type="text" class="input-text " name="gn_billing_number" id="gn_billing_number" placeholder=""></span>' );
-
-		$( "#billing_address_2_field" ).after( newNode )
-	}else{
-		$( "#billing_address_2_field" ).removeClass( "form-row-wide" ).addClass( "form-row-last" );
-		$( "#billing_address_2_field > label" ).removeClass( "screen-reader-text" ).html( "Complemento" );
-	}
-
 	if (document.getElementById( 'billing_neighborhood' )) {
 		$( "#billing_neighborhood_field" ).addClass( "validate-required" );
 		$( "#billing_neighborhood_field > label" ).removeClass( "screen-reader-text" ).html( "Bairro: <abbr class='required' title='required'>*</abbr>" );
@@ -43,10 +29,73 @@ jQuery( document ).ready(function ($) {
 				}
 			}
 		)
+	}else{
+		let newNode = $( "<p id='gn_billing_neighborhood_field'></p>" )
+		newNode.addClass( "form-row form-row-first validate-required" );
+		newNode.html( '<label for="gn_billing_neighborhood" class="">Bairro <abbr class="required" title="obrigatório">*</abbr></label><span class="woocommerce-input-wrapper"><input type="text" class="input-text " name="gn_billing_neighborhood" id="gn_billing_neighborhood" placeholder="Bairro"></span>' );
+
+		$( "#billing_address_1_field" ).after( newNode )
+
+		$( '#gn_billing_neighborhood' ).blur(function () {
+			let valor = $( '#gn_billing_neighborhood' ).val();
+
+			if ( valor == "" || valor.length < 3) {
+				$( '#gn_billing_neighborhood' ).css( 'border', '1px solid red' );
+				Swal.mixin(
+					{
+						toast: true,
+						position: 'top-right',
+						iconColor: 'white',
+						customClass: {
+							popup: 'colored-toast'
+						},
+						showConfirmButton: false,
+						timer: 5000,
+						timerProgressBar: true
+					}
+				).fire( { icon: 'error', title: 'O campo BAIRRO é obrigatório!' } )
+			} else {
+				$( '#gn_billing_neighborhood' ).css( 'border', '1px solid green' );
+			}
+		}
+	)
+
+
+
+
 	}
-		
 
 
+	if(!document.getElementById( 'billing_number' )){
+
+		let newNode = $( "<p id='gn_billing_number_field'></p>" )
+		newNode.addClass( "form-row form-row-last validate-required" );
+		newNode.html( '<label for="gn_billing_number" class="">Número <abbr class="required" title="obrigatório">*</abbr></label><span class="woocommerce-input-wrapper"><input type="text" class="input-text " name="gn_billing_number" id="gn_billing_number" placeholder="Número"></span>' );
+
+		$( "#gn_billing_neighborhood_field" ).after( newNode )
 
+		$( '#gn_billing_number' ).blur(function () {
+			let valor = $( '#gn_billing_number' ).val();
+
+			if ( valor == "" || valor.length < 3) {
+				$( '#gn_billing_number' ).css( 'border', '1px solid red' );
+				Swal.mixin(
+					{
+						toast: true,
+						position: 'top-right',
+						iconColor: 'white',
+						customClass: {
+							popup: 'colored-toast'
+						},
+						showConfirmButton: false,
+						timer: 5000,
+						timerProgressBar: true
+					}
+				).fire( { icon: 'error', title: 'O campo NÚMERO é obrigatório!' } )
+			} else {
+				$( '#gn_billing_number' ).css( 'border', '1px solid green' );
+			}
+		})
+	}
 		
 })