diff --git a/omod/pom.xml b/omod/pom.xml
index 02e0e5b1..8806a080 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -73,6 +73,12 @@
 			<version>${m2SysVersion}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>m2sys-biometrics</artifactId>
+			<version>${m2SysVersion}</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.openmrs.module</groupId>
diff --git a/omod/src/main/java/org/openmrs/module/registrationapp/form/RegisterPatientFormBuilder.java b/omod/src/main/java/org/openmrs/module/registrationapp/form/RegisterPatientFormBuilder.java
index a1e7d3ec..15767e9d 100644
--- a/omod/src/main/java/org/openmrs/module/registrationapp/form/RegisterPatientFormBuilder.java
+++ b/omod/src/main/java/org/openmrs/module/registrationapp/form/RegisterPatientFormBuilder.java
@@ -14,6 +14,7 @@
 package org.openmrs.module.registrationapp.form;
 
 import org.apache.commons.lang.StringUtils;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.jackson.JsonNode;
diff --git a/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentController.java b/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentController.java
index 47793194..36a1335d 100644
--- a/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentController.java
+++ b/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentController.java
@@ -34,6 +34,7 @@
 import org.openmrs.module.appui.UiSessionContext;
 import org.openmrs.module.emrapi.EmrApiProperties;
 import org.openmrs.module.idgen.EmptyIdentifierPoolException;
+
 import org.openmrs.module.registrationapp.PropertiesUtil;
 import org.openmrs.module.registrationapp.RegistrationAppUiUtils;
 import org.openmrs.module.registrationapp.RegistrationAppUtils;
@@ -47,6 +48,7 @@
 import org.openmrs.module.registrationcore.api.RegistrationCoreService;
 import org.openmrs.module.registrationcore.api.biometrics.model.BiometricData;
 import org.openmrs.module.registrationcore.api.biometrics.model.BiometricSubject;
+import org.openmrs.module.registrationcore.api.biometrics.model.Fingerprint;
 import org.openmrs.module.uicommons.util.InfoErrorMessageUtil;
 import org.openmrs.ui.framework.UiUtils;
 import org.openmrs.ui.framework.annotation.BindParams;
@@ -61,6 +63,8 @@
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestParam;
+//import org.openmrs.module.m2sysbiometrics.service.RegistrationService;
+import org.openmrs.module.m2sysbiometrics.service.RegistrationService;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
@@ -70,15 +74,18 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 public class RegisterPatientFragmentController {
 
     private final Log log = LogFactory.getLog(RegisterPatientFragmentController.class);
 
     private PatientService patientService;
+    //private RegistrationService registrationServicem2sys;
 
     public RegisterPatientFragmentController() {
         patientService =  Context.getService(PatientService.class);
+        //registrationServicem2sys=Context.getService(RegistrationService.class);
     }
 
     class ObsGroupItem {
@@ -127,6 +134,7 @@ public FragmentActionResult submit(UiSessionContext sessionContext, @RequestPara
                             @RequestParam(value="patientIdentifier", required = false) String patientIdentifier,
                             @RequestParam(value="localBiometricSubjectId", required = false) String localBiometricSubjectId,
                             @RequestParam(value="nationalBiometricSubjectId", required = false) String nationalBiometricSubjectId,
+							@RequestParam(value="biometricXml", required = false) String biometricXml,
                             HttpServletRequest request,
                             @SpringBean("messageSourceService") MessageSourceService messageSourceService,
                             @SpringBean("encounterService") EncounterService encounterService,
@@ -182,6 +190,19 @@ public FragmentActionResult submit(UiSessionContext sessionContext, @RequestPara
 
         // Add any biometric data that was submitted
         Map<Field, BiometricSubject> fingerprintData = RegisterPatientFormBuilder.extractBiometricDataFields(formStructure, request.getParameterMap());
+        BiometricSubject subject1=new BiometricSubject();
+if(StringUtils.isNotBlank(biometricXml)) {		
+ subject1 = new BiometricSubject();
+UUID uuid = UUID.randomUUID();
+subject1.setSubjectId(uuid.toString());
+subject1.addFingerprint(new Fingerprint("DoubleCapture", "FP1", biometricXml));	
+PatientIdentifierType identifierType1=patientService.getPatientIdentifierTypeByUuid("e26ca279-8f57-44a5-9ed8-8cc16e90e559");
+if (identifierType1 == null) {
+    throw new IllegalStateException("Invalid fingerprint configuration test. No patient identifier type with uuid [e26ca279-8f57-44a5-9ed8-8cc16e90e559] found.");
+}
+registrationData.addBiometricData(new BiometricData(subject1,identifierType1));		
+}		
+
         for (Field fingerprintField : fingerprintData.keySet()) {
             BiometricSubject subject = fingerprintData.get(fingerprintField);
             PatientIdentifierType identifierType = patientService.getPatientIdentifierTypeByUuid(fingerprintField.getUuid());
@@ -189,9 +210,23 @@ public FragmentActionResult submit(UiSessionContext sessionContext, @RequestPara
                 throw new IllegalStateException("Invalid fingerprint configuration. No patient identifier type with uuid [" + fingerprintField.getUuid() + "] found.");
             }
             registrationData.addBiometricData(new BiometricData(subject, identifierType));
-        }
+            
+        }
+/*
+  log.error();
+for (Field fingerprintField : fingerprintData.keySet()) {
+    //BiometricSubject subject = fingerprintData.get(fingerprintField);
+    BiometricSubject subject1 = new BiometricSubject();
+    subject1.addFingerprint(new Fingerprint("DoubleCapture", "FP1", biometricXml));
+    PatientIdentifierType identifierType = patientService.getPatientIdentifierTypeByUuid(fingerprintField.getUuid());
+    if (identifierType == null) {
+        throw new IllegalStateException("Invalid fingerprint configuration. No patient identifier type with uuid [" + fingerprintField.getUuid() + "] found.");
+    }
+    registrationData.addBiometricData(new BiometricData(subject1, identifierType));
+}
+*/
 
-        if (StringUtils.isNotBlank(localBiometricSubjectId)) {
+     if (StringUtils.isNotBlank(localBiometricSubjectId)) {
             BiometricData biometricData = generateBiometricData(localBiometricSubjectId,
                     RegistrationCoreConstants.GP_BIOMETRICS_PERSON_IDENTIFIER_TYPE_UUID);
             registrationData.getBiometrics().add(biometricData);
@@ -204,26 +239,32 @@ public FragmentActionResult submit(UiSessionContext sessionContext, @RequestPara
 
         try {
             // if patientIdentifier is blank, the underlying registerPatient method should automatically generate one
-            patient = registrationService.registerPatient(registrationData);
+            patient = registrationService.registerPatient(registrationData);           
+            
+            if(StringUtils.isNotBlank(biometricXml)) {
+            	log.error("XML:"+subject1.getFingerprints().get(0).getTemplate());	
+            	Context.getService(RegistrationService.class).registerLocally(subject1);
+            }
+            
         }
         catch (Exception ex) {
-
             // TODO I remember getting into trouble if i called this validator before the above save method.
             // TODO Am therefore putting this here for: https://tickets.openmrs.org/browse/RA-232
             patientValidator.validate(patient, errors);
             checkForIdentifierExceptions(ex, errors);
 
             if (!errors.hasErrors()) {
-                errors.reject(ex.getMessage());
+                errors.reject(ex.getMessage()+" the test");
             }
             return new FailureResult(createErrorMessage(errors, messageSourceService));
         }
-
+       
         // now create the registration encounter, if configured to do so
         Encounter registrationEncounter = buildRegistrationEncounter(patient, registrationDate, sessionContext, app, encounterService);
         if (registrationEncounter != null) {
             encounterService.saveEncounter(registrationEncounter);
         }
+       
 
         Map<String, List<ObsGroupItem>> obsGroupMap = new LinkedHashMap<String, List<ObsGroupItem>>();
         // build any obs that are submitted
diff --git a/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/field/FingerprintM2sysFragmentController.java b/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/field/FingerprintM2sysFragmentController.java
index 1d953aa5..18b072e4 100644
--- a/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/field/FingerprintM2sysFragmentController.java
+++ b/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/field/FingerprintM2sysFragmentController.java
@@ -2,15 +2,23 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.openmrs.Location;
 import org.openmrs.Patient;
 import org.openmrs.PatientIdentifierType;
 import org.openmrs.api.APIException;
 import org.openmrs.api.AdministrationService;
+import org.openmrs.api.LocationService;
 import org.openmrs.event.Event;
 import org.openmrs.event.EventMessage;
+import org.openmrs.module.m2sysbiometrics.service.RegistrationService;
 import org.openmrs.module.registrationapp.PropertiesUtil;
+import org.openmrs.module.registrationapp.fragment.controller.RegisterPatientFragmentController;
+import org.openmrs.PatientIdentifier;
 
 import org.openmrs.api.PatientService;
 import org.openmrs.api.context.Context;
@@ -24,19 +32,35 @@
 import org.openmrs.module.registrationcore.api.biometrics.model.BiometricSubject;
 import org.openmrs.module.registrationcore.api.biometrics.model.EnrollmentResult;
 import org.openmrs.module.registrationcore.api.biometrics.model.EnrollmentStatus;
+import org.openmrs.module.registrationcore.api.biometrics.model.Fingerprint;
 import org.openmrs.ui.framework.SimpleObject;
 import org.openmrs.ui.framework.annotation.SpringBean;
+import org.openmrs.validator.PatientIdentifierValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.web.bind.annotation.RequestMethod;
 
+import org.openmrs.module.registrationcore.api.impl.IdentifierBuilder;
+
+import org.openmrs.module.m2sysbiometrics.service.UpdateService;
+
+//@Controller
+//@RequestMapping("/FingerprintM2sys")
 public class FingerprintM2sysFragmentController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FingerprintM2sysFragmentController.class);
+    private final Log log = LogFactory.getLog(RegisterPatientFragmentController.class);
 
     private BiometricEngine biometricEngine;
 
     private AdministrationService adminService;
+    
+    private LocationService locationService;
 
     private RegistrationCoreService registrationCoreService;
 
@@ -49,6 +73,7 @@ public FingerprintM2sysFragmentController() {
         patientService =  Context.getService(PatientService.class);
     }
 
+   
     public void controller() {
     }
 
@@ -74,7 +99,8 @@ public SimpleObject enroll(@SpringBean("messageSourceService") MessageSourceServ
         } catch (Exception ex) {
             response.put("success", false);
             response.put("message", ex.getMessage());
-            LOGGER.error("Fingerprints enrollment failed", ex);
+            LOGGER.error("Fingerprints enrollment failed:test1", ex.getMessage());
+           //.error("Fingerprints enrollment failed:test1", ex);
         }
 
         return response;
@@ -127,7 +153,7 @@ public SimpleObject enrollAndSave(@RequestParam("patientId") Integer patientId,
         } catch (Exception ex) {
             response.put("success", false);
             response.put("message", ex.getMessage());
-            LOGGER.error("Fingerprints enrollment failed", ex);
+            //LOGGER.error("Fingerprints enrollment failed:test2", ex);
         }
 
         return response;
@@ -147,6 +173,7 @@ public SimpleObject getStatus() {
         return result;
     }
 
+   /* 
     public SimpleObject update(@RequestParam("id") String id,
             @SpringBean("messageSourceService") MessageSourceService messageSourceService) {
         SimpleObject response = new SimpleObject();
@@ -170,6 +197,48 @@ public SimpleObject update(@RequestParam("id") String id,
         return response;
     }
 
+    */
+    
+ //   @RequestMapping(value = {"", "/update"}, method = RequestMethod.GET)
+    public SimpleObject update(@RequestParam("patientId") Integer patientId,@RequestParam("biometricXml") String biometricXml,@RequestParam("identifierValue") String identifierValue,
+            @SpringBean("messageSourceService") MessageSourceService messageSourceService) {
+        SimpleObject response = new SimpleObject();
+        BiometricSubject subject=new BiometricSubject();
+        //log.error("this is a test for update fingerPrint >> "+identifierValue);
+        try {
+        	if(identifierValue.length()>1) {
+        		subject.setSubjectId(identifierValue);
+     		    subject.addFingerprint(new Fingerprint("DoubleCapture", "FP1", biometricXml));		
+ 			    Context.getService(UpdateService.class).updateLocally(subject);
+ 			    response.put("success", true);
+                response.put("message", subject.getSubjectId());
+        	}
+        	else 
+        	{
+        		UUID uuid = UUID.randomUUID();
+        		subject.setSubjectId(uuid.toString());
+        		subject.addFingerprint(new Fingerprint("DoubleCapture", "FP1", biometricXml));	 
+        		PatientIdentifierType identifierType=patientService.getPatientIdentifierTypeByUuid("e26ca279-8f57-44a5-9ed8-8cc16e90e559");        	
+        		Patient patient=patientService.getPatient(patientId); 
+        		PatientIdentifier identifier = new PatientIdentifier(uuid.toString(),identifierType,Context.getService(LocationService.class).getDefaultLocation());        		       		
+				patient.addIdentifier(identifier);
+				patientService.savePatientIdentifier(identifier);
+				Context.getService(RegistrationService.class).registerLocally(subject);
+				response.put("success", true);
+	            response.put("message", subject.getSubjectId());           		
+        	}
+        } catch (Exception ex) {
+            response.put("success", false);
+            response.put("message", ex.getMessage());
+            LOGGER.error(ex.getMessage());
+        }
+        return response;
+    }
+  
+    
+    
+    
+    
     public SimpleObject updateSubjectId(@RequestParam("oldId") String oldId,
             @RequestParam("newId") String newId) {
         if (!isBiometricEngineEnabled()) {
@@ -238,4 +307,26 @@ private Patient findByLocalFpId(String subjectId) {
         }
         return patient;
     }
+    
+    public PatientIdentifier createIdentifier(String identifierTypeUuid, String identifierValue, Location location) {
+        location = getLocation(location);
+        PatientIdentifierType identifierType = patientService.getPatientIdentifierTypeByUuid(identifierTypeUuid);
+        PatientIdentifierValidator.validateIdentifier(identifierValue, identifierType);
+
+        return new PatientIdentifier(identifierValue, identifierType, location);
+    }
+    
+    private Location getLocation(Location identifierLocation) {
+        if (identifierLocation == null) {
+            identifierLocation = locationService.getDefaultLocation();
+            validateIdentifierLocation(identifierLocation);
+        }
+        return identifierLocation;
+    }
+    
+    private void validateIdentifierLocation(Location identifierLocation) {
+        if (identifierLocation == null)
+            throw new APIException("Failed to resolve location to associate to patient identifiers");
+    }
+    
 }
diff --git a/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/search/M2SysSearchFragmentController.java b/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/search/M2SysSearchFragmentController.java
index 63654aad..e3c6987f 100644
--- a/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/search/M2SysSearchFragmentController.java
+++ b/omod/src/main/java/org/openmrs/module/registrationapp/fragment/controller/search/M2SysSearchFragmentController.java
@@ -2,15 +2,22 @@
 
 import javax.servlet.http.HttpSession;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.openmrs.Patient;
 import org.openmrs.PatientIdentifier;
 import org.openmrs.PatientIdentifierType;
 import org.openmrs.PersonName;
+import org.openmrs.api.context.Context;
 import org.openmrs.module.m2sysbiometrics.model.TempFingerprint;
+import org.openmrs.module.m2sysbiometrics.service.RegistrationService;
+import org.openmrs.module.m2sysbiometrics.service.SearchService;
 import org.openmrs.module.m2sysbiometrics.service.TempFingerprintService;
 import org.openmrs.module.registrationapp.PropertiesUtil;
+import org.openmrs.module.registrationapp.fragment.controller.RegisterPatientFragmentController;
 import org.openmrs.module.registrationcore.RegistrationCoreConstants;
 import org.openmrs.module.registrationcore.api.RegistrationCoreService;
+import org.openmrs.module.registrationcore.api.biometrics.model.BiometricMatch;
 import org.openmrs.module.registrationcore.api.biometrics.model.BiometricSubject;
 import org.openmrs.module.registrationcore.api.biometrics.model.EnrollmentResult;
 import org.openmrs.module.registrationcore.api.search.PatientAndMatchQuality;
@@ -37,6 +44,7 @@
 public class M2SysSearchFragmentController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(M2SysSearchFragmentController.class);
+    private final Log log = LogFactory.getLog(M2SysSearchFragmentController.class);
 
     public void controller(FragmentModel model) {
         model.addAttribute("test", "testval");
@@ -49,6 +57,33 @@ public List<SimpleObject> getPatients(@SpringBean("registrationCoreService") Reg
         return simplify(ui, patients);
     }
 
+ 
+   public SimpleObject search(@SpringBean("registrationCoreService") RegistrationCoreService registrationCoreService,
+		   @RequestParam("biometricXml") String biometricXml,
+		   @SpringBean("registrationCoreService") RegistrationCoreService registrationService) {
+	   log.info("try to search "+biometricXml);	
+	   SimpleObject response = new SimpleObject();
+	   
+	   try {
+	   List<BiometricMatch> results=Context.getService(SearchService.class).searchLocally(biometricXml);
+
+	    for (BiometricMatch result : results) {
+	    	Patient searchPatient = registrationService.findByPatientIdentifier(result.getSubjectId(),PropertiesUtil.getLocalFpType().getUuid());
+	        response.put("patientUuid", searchPatient.getUuid());   
+	       // response.put("patient", searchPatient);  
+	    }   
+	   
+	   //log.error("try to search "+results.toString());	
+	   response.put("success", true);
+	  
+	   }
+	   catch (Exception ex) {
+           log.error("try to search "+ex.getMessage());
+       }
+	   
+	   return response;
+}
+    
     public FragmentActionResult importMpiPatientWithCcd(@RequestParam("nationalFingerprintId") String nationalId,
             @SpringBean("registrationCoreService") RegistrationCoreService registrationService,
             @SpringBean("tempFingerprintService") TempFingerprintService tempFingerprintService,
diff --git a/omod/src/main/webapp/fragments/field/fingerprintM2sys.gsp b/omod/src/main/webapp/fragments/field/fingerprintM2sys.gsp
index 01bee6ff..f4f79f22 100644
--- a/omod/src/main/webapp/fragments/field/fingerprintM2sys.gsp
+++ b/omod/src/main/webapp/fragments/field/fingerprintM2sys.gsp
@@ -1,5 +1,6 @@
 <%
     ui.includeJavascript("registrationapp", "field/fingerprintM2sys.js")
+    ui.includeJavascript("registrationapp", "field/m2sysnew.js")
     ui.includeJavascript("registrationapp", "fingerprintUtils.js")
 %>
 
@@ -20,7 +21,7 @@
     <p>
         ${ui.message("registrationapp.biometrics.m2sys.register.question")}
     </p>
-    <button class="button app big" onClick="m2sysEnroll(this); return false;">
+    <button class="button app big" onClick="capture(); return false;">
         <i class="icon-hand-up"></i>
         ${ui.message("registrationapp.biometrics.m2sys.register.button.label")}
     </button>
@@ -28,6 +29,11 @@
     <p>
         <input type="text" name="localBiometricSubjectId" style="display: none"/>
         <input type="text" name="nationalBiometricSubjectId" style="display: none"/>
+        <input type="hidden" id="biometricXml" name="biometricXml" />
+	<input type="hidden" name="successMessage" id="successMessage" value="${ ui.message("registrationapp.biometrics.m2sys.register.success") }"/>
+	<input type="hidden" name="errorMessage" id="errorMessage" value="${ ui.message("registrationapp.biometrics.m2sys.register.failure") }"/>
+	<input type="hidden" name="engineMessage" id="engineMessage" value="${ ui.message("registrationapp.biometrics.m2sys.errorEngine") }"/>
+       <!--  <input type="text" id="serverResult" value="..."/> -->
     </p>
 
     <div style="display:none" id="imported-patient-dialog" class="dialog">
diff --git a/omod/src/main/webapp/fragments/field/m2sysEnrollOrUpdate.gsp b/omod/src/main/webapp/fragments/field/m2sysEnrollOrUpdate.gsp
index 1cf5f78f..8fb5fa4f 100644
--- a/omod/src/main/webapp/fragments/field/m2sysEnrollOrUpdate.gsp
+++ b/omod/src/main/webapp/fragments/field/m2sysEnrollOrUpdate.gsp
@@ -1,6 +1,7 @@
 <%
 	ui.includeJavascript("registrationapp", "field/fingerprintM2sys.js")
 	ui.includeJavascript("registrationapp", "fingerprintUtils.js")
+	 ui.includeJavascript("registrationapp", "field/m2sysnew.js")
 %>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 <div id="fingerprint-fragment" style="margin-top:10px;margin-left:5px;margin-right:5px;margin-bottom:10px;">
@@ -15,6 +16,12 @@
 		</button><br />
 		<input type="text" name="fingerprintSubjectId" class="invisible"/>
 	</p>
+	<input type="hidden" id="biometricXml" name="biometricXml"/>
+	<input type="hidden" name="identifierValue" id="identifierValue" value="${ biometricID }"/>
+	<input type="hidden" name="patient_id" id="patient_id" value="${ patient.id }"/>
+	<input type="hidden" name="successMessage" id="successMessage" value="${ ui.message("registrationapp.biometrics.m2sys.register.success") }"/>
+	<input type="hidden" name="errorMessage" id="errorMessage" value="${ ui.message("registrationapp.biometrics.m2sys.register.failure") }"/>
+	<input type="hidden" name="engineMessage" id="engineMessage" value="${ ui.message("registrationapp.biometrics.m2sys.errorEngine") }"/>
 
 </div>
 <script type="text/javascript">
@@ -24,6 +31,7 @@
         'registrationapp.biometrics.m2sys.register.alreadyExists.failure'
     ]);
 	var fingerprintSubjectIdField = jq("[name='fingerprintSubjectId']");
+	
 	var buttonLabelEnroll = "${ ui.message("registrationapp.biometrics.m2sys.register.button.label") }";
 	var buttonLabelUpdate = "${ ui.message("registrationapp.biometrics.m2sys.update.button.label") }";
 	var enrollOrUpdate = "${ enrollOrUpdate }";
@@ -38,20 +46,13 @@
 			}
 		});
 
-		jq(fingerprintButton).click(function() {
-			if (enrollOrUpdate == "update") {
-			    m2sysUpdate(biometricID, this);
-			} else {
-			    m2sysEnrollAndSave('${ patient.id }', this, function(biometricIdentifier) {
-			        jq('#fingerprintButtonLabel').text(buttonLabelUpdate);
-			        enrollOrUpdate = "update";
-			        biometricID = biometricIdentifier;
-			    });
-			}
-		});
+		jq(fingerprintButton).click(function() { 
+		                                           capture(); 
+		                                       });
 
 		jq(fingerprintSubjectIdField).change(function() {
 			biometricID = jq(fingerprintSubjectIdField).val();
+			alert("this is a test 1");
 			if (biometricID) {
 				emr.getFragmentActionWithCallback('coreapps', 'editPatientIdentifier', 'editPatientIdentifier',
 					{ patientId: ${ patient.id },
@@ -65,9 +66,8 @@
 					},
 					function(err){
 						emr.handleError(err);
-					}
-				);
+					});
 			}
 		});
-	});
+});		
 </script>
diff --git a/omod/src/main/webapp/fragments/search/m2SysSearch.gsp b/omod/src/main/webapp/fragments/search/m2SysSearch.gsp
index 41add0cf..3fd6ac51 100644
--- a/omod/src/main/webapp/fragments/search/m2SysSearch.gsp
+++ b/omod/src/main/webapp/fragments/search/m2SysSearch.gsp
@@ -1,6 +1,7 @@
 <%
     ui.includeJavascript("registrationapp", "field/fingerprintM2sys.js")
     ui.includeJavascript("registrationapp", "fingerprintUtils.js")
+     ui.includeJavascript("registrationapp", "field/m2sysnew.js")
 %>
 
 <script>
@@ -28,22 +29,8 @@
         var searchButton = jq('#fingerprint_search_button');
         searchButton.click(function () {
             toggleFingerprintButtonDisplay(searchButton);
-            jq.getJSON('${ ui.actionLink("getPatients") }', {})
-                .always(function () {
-                    toggleFingerprintButtonDisplay(searchButton);
-                })
-                .success(function (data) {
-                    patientSearchWidget.reset();
-                    if (data) {
-                        patientSearchWidget.setHandleRowSelection(handlePatientRowSelection);
-                        patientSearchWidget.updateSearchResults(data);
-                    } else {
-                        alert("No matches");
-                    }
-                })
-                .error(function (xhr, status, err) {
-                    alert('AJAX error ' + err);
-                })
+            capture();   
+            toggleFingerprintButtonDisplay(searchButton);             
         });
     });
 
@@ -81,6 +68,11 @@
         <i class="icon-hand-up"></i><span id="fingerprintButtonLabel"></span>
     </button>
     <input type="text" name="fingerprintSubjectId" class="invisible" size="1" style="min-width:1em;"/>
+    <input type="hidden" id="biometricXml" name="biometricXml"/>
+    <input type="hidden" id="searchFinger" name="searchFinger" value="1"/>
+	<input type="hidden" name="successMessage" id="successMessage" value="${ ui.message("registrationapp.biometrics.m2sys.register.success") }"/>
+	<input type="hidden" name="errorMessage" id="errorMessage" value="${ ui.message("registrationapp.biometrics.m2sys.register.failure") }"/>
+	<input type="hidden" name="engineMessage" id="engineMessage" value="${ ui.message("registrationapp.biometrics.m2sys.errorEngine") }"/>
 </div>
 
 <div style="display:none" id="patient-importing-dialog" class="dialog">
diff --git a/omod/src/main/webapp/resources/scripts/field/m2sysnew.js b/omod/src/main/webapp/resources/scripts/field/m2sysnew.js
new file mode 100644
index 00000000..ac4f696d
--- /dev/null
+++ b/omod/src/main/webapp/resources/scripts/field/m2sysnew.js
@@ -0,0 +1,141 @@
+        
+/*API Call*/
+function capture() {
+var deviceName = 'Secugen'; 
+var templateFormat = 'FP1';
+var engineName = 'FP1';
+var apiPath = 'http://localhost:15896/api/CloudScanr/FPCapture';
+
+CallFPBioMetricCapture(SuccessFunc, ErrorFunc, apiPath, deviceName, templateFormat, engineName);
+ }
+
+function CallFPBioMetricCapture(SuccessFunc, ErrorFunc, apiPath, deviceName, templateFormat, engineName) {
+
+var uri =  apiPath;
+
+var xmlhttp = new XMLHttpRequest();
+xmlhttp.onreadystatechange = function () {
+    if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+        fpobject = JSON.parse(xmlhttp.responseText);
+        SuccessFunc(fpobject, engineName);
+    }
+    else if (xmlhttp.status == 404) {
+        ErrorFunc(xmlhttp.status)
+    }
+}
+
+
+var captureType = 'DoubleCapture';
+var quickScan = 'Enable';
+var successMessage=document.getElementById('successMessage').value;
+var errorMessage=document.getElementById('errorMessage').value;
+var engineMessage=document.getElementById('engineMessage').value;
+
+xmlhttp.open("POST", uri, true);
+xmlhttp.setRequestHeader("Content-Type", "application/json");
+
+//xmlhttp.setRequestHeader('Access-Control-Allow-Origin', req.headers.origin);
+xmlhttp.setRequestHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+//var params = "customerKey=" + customerKey + "&captureLicenseKey=" + captureLicenseKey + "&accessPointID=" + accessPointID;
+
+//xmlhttp.send(params);
+xmlhttp.send(JSON.stringify({
+    "DeviceName": deviceName,
+    "TemplateFormat": templateFormat, "CaptureType": captureType,"QuickScan": quickScan,"CaptureTimeOut": 120, "CaptureOperationName":"ENROLL"
+}));
+
+xmlhttp.onerror = function () {
+    ErrorFunc(xmlhttp.statusText);
+}
+}
+
+function SuccessFunc(result, engineName) {
+if (result.CloudScanrStatus.Success) {
+
+    if (result.TemplateData != null && result.TemplateData.length > 0) {
+        document.getElementById('biometricXml').value = result.TemplateData;
+    }
+    //document.getElementById('<%= serverResult.ClientID %>').value = "Capture success. Please click on capture button";
+ //$('#serverResult').val('Capture success. Please click on capture button');
+    $('#fingerprintStatus').text(successMessage);
+ 
+ var patient_id;
+ var searchFinger;
+ var element;
+
+    element = document.getElementById('patient_id');	
+    if (element != null) {
+           patient_id = element.value;
+       }
+    else {
+           patient_id = '';
+         }
+
+
+    element = document.getElementById('searchFinger');
+	if (element != null) {
+          searchFinger = element.value;
+       }
+    else {
+          searchFinger = '';
+         }
+
+	
+if(patient_id!='')	
+    {	
+        saveFinger();
+    } 
+
+if(searchFinger == '1')	
+    {	
+        searchPatient();
+    }	
+	
+ 
+}
+else {
+  //$('#serverResult').val(result.CloudScanrStatus.Message);
+	$('#fingerprintStatus').text(result.CloudScanrStatus.Message);
+	
+}
+}
+
+function ErrorFunc(status) {
+//$('#serverResult').val('CloudScanr client may not started. Please check.');
+alert(engineMessage);
+	//$('#fingerprintStatus').text(engineMessage);
+}
+
+function saveFinger() {
+    	var biometricXml=document.getElementById('biometricXml').value;
+	    var identifierValue=document.getElementById('identifierValue').value;
+	    var patient_id=document.getElementById('patient_id').value;
+		var successMessage=document.getElementById('successMessage').value;
+		var errorMessage=document.getElementById('errorMessage').value;
+	if(identifierValue=='') identifierValue=0;
+    jq.getJSON('/' + OPENMRS_CONTEXT_PATH + '/registrationapp/field/fingerprintM2sys/update.action',{ patientId: patient_id,biometricXml:biometricXml,identifierValue:identifierValue  })
+        .success(function (data) {
+        	$('#fingerprintStatus').text(successMessage);
+        })
+		.error(function(data) { $('#fingerprintError').text(errorMessage);  });
+}
+
+
+function searchPatient() {
+    	var biometricXml=document.getElementById('biometricXml').value;
+    jq.getJSON('/' + OPENMRS_CONTEXT_PATH + '/registrationapp/search/M2SysSearch/search.action',{biometricXml:biometricXml})
+        .success(function (data) {
+           redirectToPatient(data['patientUuid']);
+        })
+		.error(function(data) {  alert(errorMessage); $('#fingerprintError').text(errorMessage);  });
+}
+
+function redirectToPatient(patientUuid) {
+      emr.navigateTo({
+        provider: 'coreapps',
+        page: 'clinicianfacing/patient',
+        query: { patientId: patientUuid }
+      });
+    }
+
+	
\ No newline at end of file
diff --git a/omod/src/test/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentControllerTest.java b/omod/src/test/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentControllerTest.java
index 96321022..7ee0a602 100644
--- a/omod/src/test/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentControllerTest.java
+++ b/omod/src/test/java/org/openmrs/module/registrationapp/fragment/controller/RegisterPatientFragmentControllerTest.java
@@ -178,7 +178,7 @@ public void testPostWithObs() throws Exception {
 
         FragmentActionResult result = controller.submit(sessionContext, app, registrationService,
                 patient, name, address, 30, null, null, null, null, null, null,
-                request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
+                null, request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
                 patientValidator, uiUtils);
 
         assertTrue(result instanceof SuccessResult);
@@ -199,7 +199,7 @@ public void testPostWithCodedObs() throws Exception {
 
         FragmentActionResult result = controller.submit(sessionContext, app, registrationService,
                 patient, name, address, 30, null, null, null, null, null, null,
-                request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
+                null, request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
                 patientValidator, uiUtils);
 
         assertTrue(result instanceof SuccessResult);
@@ -224,7 +224,7 @@ public void testPostWithEncounterAndObs() throws Exception {
 
         FragmentActionResult result = controller.submit(sessionContext, app, registrationService,
                 patient, name, address, 30, null, null, null, null, null, null,
-                request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
+                null, request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
                 patientValidator, uiUtils);
 
         assertTrue(result instanceof SuccessResult);
@@ -251,7 +251,7 @@ public void testWithUnknownPatient() throws Exception {
 
         FragmentActionResult result = controller.submit(sessionContext, app, registrationService,
                 patient, name, address, 30, null, null, true, null, null, null,
-                request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
+                null, request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
                 patientValidator, uiUtils);
 
         assertTrue(result instanceof SuccessResult);
@@ -298,7 +298,7 @@ public void testPostWithPatientIdentifier() throws Exception {
 
         FragmentActionResult result = controller.submit(sessionContext, app, registrationService,
                 patient, name, address, 30, null, null, true, null, null, null,
-                request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
+                null, request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
                 patientValidator, uiUtils);
 
         assertTrue(result instanceof SuccessResult);
@@ -343,7 +343,7 @@ public void testPostToUpdatePatientIdentifier() throws Exception {
 
         FragmentActionResult result = controller.submit(sessionContext, app, registrationService,
                 patient, name, address, 30, null, null, true, null, null, null,
-                request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
+                null, request, messageSourceService, encounterService, obsService, conceptService, patientService, emrApiProperties,
                 patientValidator, uiUtils);
 
         assertTrue(result instanceof SuccessResult);