diff --git a/app/index.html b/app/index.html
index e9a600c..819d1de 100644
--- a/app/index.html
+++ b/app/index.html
@@ -24,6 +24,8 @@
       <link href="bower_components/angular-xeditable/dist/css/xeditable.css" rel="stylesheet">
       <link href="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.css"
                 rel="stylesheet">
+      <link href="bower_components/angular-ui-select/dist/select.css"
+                rel="stylesheet">
 
 
       <link rel="stylesheet" href="css/main.css"/>
@@ -87,6 +89,7 @@
       <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
       <script src="bower_components/angular-resource/angular-resource.min.js"></script>
       <script src="bower_components/angular-animate/angular-animate.js"></script>
+      <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
       <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
       <script src="bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js"></script>
       <script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
@@ -100,6 +103,7 @@
       <script src="bower_components/angular-xeditable/dist/js/xeditable.js"></script>
       <script src="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.js"></script>
       <script src="bower_components/select2/select2.js"></script>
+      <script src="bower_components/angular-ui-select/dist/select.js"></script>
       <script src="bower_components/angular-ui-select2/src/select2.js"></script>
       <script src="bower_components/angular-ckeditor/angular-ckeditor.js"></script>
       <script src="bower_components/angular-dragdrop/src/angular-dragdrop.min.js"></script>
diff --git a/app/js/app.js b/app/js/app.js
index 8d04206..1ee6377 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-  angular.module('acufuel', ['nvd3', 'ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2', 'ckeditor', 'ui.calendar', 'ngDragDrop'])
+  angular.module('acufuel', ['nvd3', 'ngCookies', 'ngResource', 'ngSanitize', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2', 'ckeditor', 'ui.calendar', 'ngDragDrop', 'ui.select'])
 
     .config(['$httpProvider', function($httpProvider) {
       $httpProvider.defaults.withCredentials = true;
diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js
index e27e139..6771956 100644
--- a/app/partials/viewCompany/viewCompany.controller.js
+++ b/app/partials/viewCompany/viewCompany.controller.js
@@ -12,6 +12,7 @@
         $scope.showLoader = false;
         $scope.showUpdateBtn = false;
         $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'));
+        $scope.selected = [];
 
         $(document).ready(function() {
             $("#reset").click(function() {
@@ -19,6 +20,46 @@
             });
         });
 
+        $scope.values = [
+          {'id': 1, 'first': 'Tenant/Base Customer'}, 
+          {'id': 2, 'first': 'FuelerLinx Customer'},
+          {'id': 3, 'first': 'CAA Member'}
+        ];
+
+        $scope.changeValue = function(selected){
+          $scope.showUpdateBtn = true;
+          console.log("data to be true", selected);
+          for (var i=0;i<selected.length;i++){
+            console.log(selected[i])
+            if(selected[i] == 'Tenant/Base Customer'){
+              $scope.companyData.baseTenant = true;
+            }else{
+              $scope.companyData.baseTenant = false;
+            }
+            if(selected[i] == 'FuelerLinx Customer'){
+              $scope.companyData.fuelerlinxCustomer = true;
+            }else{
+              $scope.companyData.fuelerlinxCustomer = false;
+            }
+
+            if(selected[i] == 'CAA Member'){
+              $scope.companyData.contractFuelVendor = true;
+            }else{
+              $scope.companyData.contractFuelVendor = false;
+            }
+
+            console.log($scope.companyData)
+            
+          }
+
+        }
+
+        // $scope.selected =[
+        //   {'id': 1, 'first': 'Tenant/Base Customer'}, 
+        //   {'id': 2, 'first': 'FuelerLinx Customer'},
+        //   {'id': 3, 'first': 'CAA Member'}
+        // ];
+
         // CustomersService.getMargin().then(function(result) {
         //   $scope.marginList = result;
         // })
@@ -35,12 +76,36 @@
           ViewCompanyService.getCompany(companyId).then(function(result) {
             $scope.companyData = result;
             $scope.isGlobal = result.global;
+            if(result.global == true){
+              $scope.companyData.global = true;
+            }
             if(result.margin != null){
                $scope.companyData.masterMargin = result.margin.id;
             }
             if(result.marginAVGAS != null){
                 $scope.companyData.avgasMargin = result.marginAVGAS.id;
              }
+             
+
+
+             if($scope.companyData.baseTenant){
+              
+              $scope.selected.push({'first': 'Tenant/Base Customer'})
+              console.log("$scope.selected",$scope.selected)
+
+             }
+
+             if($scope.companyData.fuelerlinxCustomer){
+              $scope.selected.push({'first': 'FuelerLinx Customer'})
+              console.log("$scope.selected",$scope.selected)
+             }
+
+             if($scope.companyData.contractFuelVendor){
+              $scope.selected.push({'first': 'CAA Member'})
+              console.log("$scope.selected",$scope.selected)
+             }
+
+             console.log("$scope.companyData",$scope.companyData)
             getAircraftList();
             $scope.showLoader = false;
           })
@@ -262,7 +327,7 @@
             + $scope.companyData.state + "&country=" + $scope.companyData.country + "&zipcode=" + $scope.companyData.zipcode + "&internalNote=" 
             + $scope.companyData.internalNote + "&certificateType=" + $scope.companyData.certificateType + "&baseTenant=" + $scope.companyData.baseTenant
             + "&fuelerlinxCustomer=" + $scope.companyData.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.companyData.contractFuelVendor 
-            + "&activate=" + $scope.companyData.activate + "&baseIcao=" + $scope.companyData.baseIcao + "&companyId=" + companyId;
+            + "&activate=" + $scope.companyData.activate + "&baseIcao=" + $scope.companyData.baseIcao + "&companyId=" + companyId + "&global=" + $scope.companyData.global;
 
           ViewCompanyService.updateCompany(companyData).then(function(result) {
             if(result != null && result.success){
diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html
index 478bbd6..01d2c19 100644
--- a/app/partials/viewCompany/viewCompany.html
+++ b/app/partials/viewCompany/viewCompany.html
@@ -188,6 +188,15 @@
                                  <div class="clearfix"></div>
                               </p>
                            </div>
+                           <div>
+                           <ui-select multiple class="form-control" ng-model="selected" name="name" ng-change="changeValue(selected)">
+                              <ui-select-match placeholder="Select or Search">{{$item.first}}</ui-select-match>
+                              <ui-select-choices repeat="val.first as val in values | filter: $select.search">
+                               {{val.first}}
+                               <!-- <div ng-bind-html="val | highlight: $select"></div> -->
+                              </ui-select-choices>
+                            </ui-select>
+                           </div>
                            </br>
                            <div class="new-address">
                            </div>
diff --git a/bower.json b/bower.json
index 00fff66..4bdb0b0 100644
--- a/bower.json
+++ b/bower.json
@@ -38,6 +38,8 @@
     "angular-ckeditor": "^1.0.3",
     "angular-ui-calendar": "^1.0.2",
     "angular-dragdrop": "^1.0.13",
-    "angular-nvd3": "^1.0.9"
+    "angular-nvd3": "^1.0.9",
+    "angular-ui-select": "~0.19.8",
+    "angular-sanitize": "~1.6.6"
   }
 }