diff --git a/BioMetrixCore/Master.Designer.cs b/BioMetrixCore/Master.Designer.cs
index 958aec2..d5550a8 100644
--- a/BioMetrixCore/Master.Designer.cs
+++ b/BioMetrixCore/Master.Designer.cs
@@ -52,8 +52,8 @@ private void InitializeComponent()
             this.panel1 = new System.Windows.Forms.Panel();
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
             this.btnGetAllUserID = new System.Windows.Forms.Button();
-            this.lblDeviceInfo = new System.Windows.Forms.Label();
             this.btnUploadUserInfo = new System.Windows.Forms.Button();
+            this.lblDeviceInfo = new System.Windows.Forms.Label();
             this.pnlHeader.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvRecords)).BeginInit();
             this.panel1.SuspendLayout();
@@ -320,6 +320,15 @@ private void InitializeComponent()
             this.btnGetAllUserID.UseVisualStyleBackColor = true;
             this.btnGetAllUserID.Click += new System.EventHandler(this.btnGetAllUserID_Click);
             // 
+            // btnUploadUserInfo
+            // 
+            this.btnUploadUserInfo.Location = new System.Drawing.Point(718, 3);
+            this.btnUploadUserInfo.Name = "btnUploadUserInfo";
+            this.btnUploadUserInfo.Size = new System.Drawing.Size(65, 48);
+            this.btnUploadUserInfo.TabIndex = 893;
+            this.btnUploadUserInfo.Text = "Upload User Info";
+            this.btnUploadUserInfo.UseVisualStyleBackColor = true;
+            // 
             // lblDeviceInfo
             // 
             this.lblDeviceInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -330,15 +339,6 @@ private void InitializeComponent()
             this.lblDeviceInfo.TabIndex = 892;
             this.lblDeviceInfo.Text = "Device Info : --";
             // 
-            // btnUploadUserInfo
-            // 
-            this.btnUploadUserInfo.Location = new System.Drawing.Point(718, 3);
-            this.btnUploadUserInfo.Name = "btnUploadUserInfo";
-            this.btnUploadUserInfo.Size = new System.Drawing.Size(65, 48);
-            this.btnUploadUserInfo.TabIndex = 893;
-            this.btnUploadUserInfo.Text = "Upload User Info";
-            this.btnUploadUserInfo.UseVisualStyleBackColor = true;
-            // 
             // Master
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -354,6 +354,7 @@ private void InitializeComponent()
             this.Name = "Master";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Biometric Device Demo";
+            this.Load += new System.EventHandler(this.Master_Load);
             this.pnlHeader.ResumeLayout(false);
             this.pnlHeader.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvRecords)).EndInit();
diff --git a/BioMetrixCore/Master.cs b/BioMetrixCore/Master.cs
index ac2a63c..7b6d086 100644
--- a/BioMetrixCore/Master.cs
+++ b/BioMetrixCore/Master.cs
@@ -2,6 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 using System.Collections.Generic;
+using zkemkeeper;
 
 namespace BioMetrixCore
 {
@@ -80,6 +81,11 @@ private void RaiseDeviceEvent(object sender, string actionType)
 
         }
 
+        private void zkemClient_OnFinger()
+        {
+            /* control on finger event here */
+        }
+
 
         private void btnConnect_Click(object sender, EventArgs e)
         {
@@ -116,8 +122,12 @@ private void btnConnect_Click(object sender, EventArgs e)
                 objZkeeper = new ZkemClient(RaiseDeviceEvent);
                 IsDeviceConnected = objZkeeper.Connect_Net(ipAddress, portNumber);
 
+                /* once device connection has been established, the events can be registered using line 128-129 */
                 if (IsDeviceConnected)
                 {
+                    if (this.objZkeeper.objCZKEM.RegEvent(1, 65535))
+                        objZkeeper.objCZKEM.OnFinger += new _IZKEMEvents_OnFingerEventHandler(zkemClient_OnFinger);
+
                     string deviceInfo = manipulator.FetchDeviceInfo(objZkeeper, int.Parse(tbxMachineNumber.Text.Trim()));
                     lblDeviceInfo.Text = deviceInfo;
                 }
@@ -354,6 +364,9 @@ private void tbxPort_TextChanged(object sender, EventArgs e)
         private void tbxMachineNumber_TextChanged(object sender, EventArgs e)
         { UniversalStatic.ValidateInteger(tbxMachineNumber); }
 
+        private void Master_Load(object sender, EventArgs e)
+        {
 
+        }
     }
 }
diff --git a/BioMetrixCore/Utilities/ZkemClient.cs b/BioMetrixCore/Utilities/ZkemClient.cs
index 7c61e6c..705fa4f 100644
--- a/BioMetrixCore/Utilities/ZkemClient.cs
+++ b/BioMetrixCore/Utilities/ZkemClient.cs
@@ -12,7 +12,7 @@ public ZkemClient(Action<object, string> RaiseDeviceEvent)
         { this.RaiseDeviceEvent = RaiseDeviceEvent; }
 
 
-        CZKEM objCZKEM = new CZKEM();
+        internal CZKEM objCZKEM = new CZKEM();
 
         #region 'What we will be using'
 
diff --git a/BioMetrixCore/bin/Debug/BioMetrixCore.exe b/BioMetrixCore/bin/Debug/BioMetrixCore.exe
index 44240f7..9574924 100644
Binary files a/BioMetrixCore/bin/Debug/BioMetrixCore.exe and b/BioMetrixCore/bin/Debug/BioMetrixCore.exe differ
diff --git a/BioMetrixCore/bin/Debug/BioMetrixCore.pdb b/BioMetrixCore/bin/Debug/BioMetrixCore.pdb
index 73c801f..6f93fe2 100644
Binary files a/BioMetrixCore/bin/Debug/BioMetrixCore.pdb and b/BioMetrixCore/bin/Debug/BioMetrixCore.pdb differ
diff --git a/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.FileListAbsolute.txt b/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.FileListAbsolute.txt
index 1e4ce0d..24a454b 100644
--- a/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.FileListAbsolute.txt
+++ b/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.FileListAbsolute.txt
@@ -10,3 +10,16 @@ D:\Zktech\ZKTeco Using C#\BioMatrix\BioMetrixCore\obj\Debug\BioMetrixCore.Proper
 D:\Zktech\ZKTeco Using C#\BioMatrix\BioMetrixCore\obj\Debug\BioMetrixCore.csproj.GenerateResource.Cache
 D:\Zktech\ZKTeco Using C#\BioMatrix\BioMetrixCore\obj\Debug\BioMetrixCore.exe
 D:\Zktech\ZKTeco Using C#\BioMatrix\BioMetrixCore\obj\Debug\BioMetrixCore.pdb
+C:\GitHub\BioMetrix\BioMetrixCore\bin\Debug\BioMetrixCore.exe.config
+C:\GitHub\BioMetrix\BioMetrixCore\bin\Debug\BioMetrixCore.exe
+C:\GitHub\BioMetrix\BioMetrixCore\bin\Debug\BioMetrixCore.pdb
+C:\GitHub\BioMetrix\BioMetrixCore\obj\Debug\BioMetrixCore.csproj.AssemblyReference.cache
+C:\GitHub\BioMetrix\BioMetrixCore\obj\Debug\Interop.zkemkeeper.dll
+C:\GitHub\BioMetrix\BioMetrixCore\obj\Debug\BioMetrixCore.csproj.ResolveComReference.cache
+C:\GitHub\BioMetrix\BioMetrixCore\obj\Debug\BioMetrixCore.DataEmpty.resources
+C:\GitHub\BioMetrix\BioMetrixCore\obj\Debug\BioMetrixCore.Master.resources
+C:\GitHub\BioMetrix\BioMetrixCore\obj\Debug\BioMetrixCore.Properties.Resources.resources
+C:\GitHub\BioMetrix\BioMetrixCore\obj\Debug\BioMetrixCore.csproj.GenerateResource.cache
+C:\GitHub\BioMetrix\BioMetrixCore\obj\Debug\BioMetrixCore.csproj.CoreCompileInputs.cache
+C:\GitHub\BioMetrix\BioMetrixCore\obj\Debug\BioMetrixCore.exe
+C:\GitHub\BioMetrix\BioMetrixCore\obj\Debug\BioMetrixCore.pdb
diff --git a/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.GenerateResource.Cache b/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.GenerateResource.Cache
index 7cbbdbd..45544b8 100644
Binary files a/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.GenerateResource.Cache and b/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.GenerateResource.Cache differ
diff --git a/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.ResolveComReference.cache b/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.ResolveComReference.cache
index fca51e7..788825b 100644
Binary files a/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.ResolveComReference.cache and b/BioMetrixCore/obj/Debug/BioMetrixCore.csproj.ResolveComReference.cache differ
diff --git a/BioMetrixCore/obj/Debug/BioMetrixCore.exe b/BioMetrixCore/obj/Debug/BioMetrixCore.exe
index 44240f7..9574924 100644
Binary files a/BioMetrixCore/obj/Debug/BioMetrixCore.exe and b/BioMetrixCore/obj/Debug/BioMetrixCore.exe differ
diff --git a/BioMetrixCore/obj/Debug/BioMetrixCore.pdb b/BioMetrixCore/obj/Debug/BioMetrixCore.pdb
index 73c801f..6f93fe2 100644
Binary files a/BioMetrixCore/obj/Debug/BioMetrixCore.pdb and b/BioMetrixCore/obj/Debug/BioMetrixCore.pdb differ
diff --git a/BioMetrixCore/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/BioMetrixCore/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index e6fa96a..b6984de 100644
Binary files a/BioMetrixCore/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/BioMetrixCore/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/BioMetrixCore/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/BioMetrixCore/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f100024..f996ea9 100644
Binary files a/BioMetrixCore/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/BioMetrixCore/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/BioMetrixCore/obj/Debug/Interop.zkemkeeper.dll b/BioMetrixCore/obj/Debug/Interop.zkemkeeper.dll
index d4b012c..4301e1e 100644
Binary files a/BioMetrixCore/obj/Debug/Interop.zkemkeeper.dll and b/BioMetrixCore/obj/Debug/Interop.zkemkeeper.dll differ