diff --git a/src/app/command-modal-demo/command-modal-demo.module.ts b/src/app/command-modal-demo/command-modal-demo.module.ts
index ec74f1e..1838a43 100644
--- a/src/app/command-modal-demo/command-modal-demo.module.ts
+++ b/src/app/command-modal-demo/command-modal-demo.module.ts
@@ -5,7 +5,7 @@ import { CommandModalDemoRoutingModule } from './command-modal-demo-routing.modu
 import { DataGridModule } from '@poweredsoft/ngx-cdk-ui';
 
 import {FormsModule} from '@angular/forms';
-import { CommandModalModule, psbxPaginationModule } from '@poweredsoft/ngx-bootstrap';
+import { CommandModalModule, psbxPaginationModule, ConfirmModalModule } from '@poweredsoft/ngx-bootstrap';
 @NgModule({
   declarations: [CommandModalDemoComponent],
   imports: [
@@ -14,7 +14,8 @@ import { CommandModalModule, psbxPaginationModule } from '@poweredsoft/ngx-boots
     DataGridModule,
     CommandModalModule,
     FormsModule,
-    psbxPaginationModule
+    psbxPaginationModule,
+    ConfirmModalModule
   ]
 })
 export class CommandModalDemoModule { }
diff --git a/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.html b/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.html
index 204c20d..d3bfc3e 100644
--- a/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.html
+++ b/src/app/command-modal-demo/command-modal-demo/command-modal-demo.component.html
@@ -27,8 +27,8 @@
             <button class="btn-primary btn" psbxCommandModal [commandTitle]="'Change ' + model.name + ' name'" commandText="Update"
             [dataSource]="merchantDataSource" command="changeMerchant" [model]="model" [template]="changeName">Change</button>
 
-            <button class="btn-danger btn" psbxCommandModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
-            [dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >Remove</button>
+            <button class="btn-danger btn" psbxConfirmModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
+            [dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >RemoveIt</button>
         </ng-container>
     </ng-container>
         <ng-container *psDataGridFooter>
diff --git a/src/app/form-group-modal-demo/form-group-modal-demo.module.ts b/src/app/form-group-modal-demo/form-group-modal-demo.module.ts
index 24e48b7..03652ca 100644
--- a/src/app/form-group-modal-demo/form-group-modal-demo.module.ts
+++ b/src/app/form-group-modal-demo/form-group-modal-demo.module.ts
@@ -5,6 +5,7 @@ import { FormGroupModalDemoRoutingModule } from './form-group-modal-demo-routing
 import { DataGridModule } from '@poweredsoft/ngx-cdk-ui';
 import { FormGroupCommandModalModule,CommandModalModule, psbxPaginationModule } from '@poweredsoft/ngx-bootstrap';
 import { ReactiveFormsModule } from '@angular/forms';
+import { ConfirmModalModule } from 'projects/poweredsoft/ngx-bootstrap/src/public-api';
 
 
 
@@ -16,7 +17,8 @@ import { ReactiveFormsModule } from '@angular/forms';
     DataGridModule,
     FormGroupCommandModalModule,
     ReactiveFormsModule,
-    psbxPaginationModule
+    psbxPaginationModule,
+    ConfirmModalModule,
     
   ]
 })
diff --git a/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html b/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html
index ea67239..02442e8 100644
--- a/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html
+++ b/src/app/form-group-modal-demo/form-group-modal-demo/form-group-modal-demo.component.html
@@ -24,10 +24,8 @@
             <button class="btn-success btn" psbxFormGroupCommandModal [commandTitle]="'Change ' + model.name + ' name'" commandText="Update"
             [dataSource]="merchantDataSource" command="changeMerchant" (formCreate)="onFormCreate($event)" [model]="model" [template]="theModal">Change</button>
 
-            <button class="btn-danger btn" psbxFormGroupCommandModal 
-            [commandTitle]="'remove ' + model.name + ' name'" commandText="delete"
-            [dataSource]="merchantDataSource" command="removeMerchant" 
-            [model]="model"  (formCreate)="onFormCreate($event)">Remove</button>
+            <button class="btn-danger btn" psbxConfirmModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
+            [dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >Delete!</button>
 
             <!-- <button class="btn-danger btn" psbxExecuteCommand [dataSource]="merchantDataSource" [command]="removeMerchant"
              [model]="model" [confirm]="true" [confirmMessage]="do you wish to delete the merchant `' + model.name + '`" [refresh]="false">Delete</button> -->
diff --git a/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.html b/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.html
index 21597ea..fad970a 100644
--- a/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.html
+++ b/src/app/pagination-demo/pagination-demo/pagination/pagination-demo.component.html
@@ -44,7 +44,6 @@
         <ng-container *psDataGridCell="let model">
             <button class="btn-danger btn" psbxConfirmModal [commandTitle]="'Are you sure you wnat to remove ' + model.name + '?'" commandText="Remove"
             [dataSource]="merchantDataSource" command="removeMerchant" [model]="model" >Remove</button>
-            <!-- <button class="btn-danger btn" (click)="removeMerchant(model.id)">Remove</button> -->
         </ng-container>
     </ng-container>
 
@@ -52,7 +51,7 @@
         <psbx-ds-pagination [dataSource]="merchantDataSource"></psbx-ds-pagination> 
     </ng-container>
 </ps-data-grid>
-<!-- <button (click)="testService()">Test confirm</button> -->
+
 
 
 <ng-template #confirm>