diff --git a/qcbadge/Controllers/HomeController.cs b/qcbadge/Controllers/HomeController.cs
index 214ff56..5930e38 100644
--- a/qcbadge/Controllers/HomeController.cs
+++ b/qcbadge/Controllers/HomeController.cs
@@ -176,17 +176,19 @@ namespace qcbadge.Controllers
                     System.Diagnostics.Debug.WriteLine(advertData);
                 }
 
-                String header = "0x0201040319DC190FFFD304";
-                String footer = "090841524F5947424956";
+                //String header = "0x0201040319DC190FFFD304";
+                //String footer = "090841524F5947424956";
 
-                if(advertData.StartsWith(header) && advertData.EndsWith(footer))
+                String header = "0xD304";
+
+                if (advertData.StartsWith(header))
                 {
 
                     //http://tomeko.net/online_tools/hex_to_base64.php?lang=en
 
                     //for base64 convert
 
-                    String crcData = advertData.Substring(24, 18);
+                    String crcData = advertData.Substring(2, 18);
                     System.Diagnostics.Debug.WriteLine("CRC to check: " + crcData.ToString());
                     ushort crcrsp = CCITT_CRC16(crcData);
                     System.Diagnostics.Debug.WriteLine("CRC resp: " + crcrsp.ToString());
@@ -200,7 +202,7 @@ namespace qcbadge.Controllers
 
 
 
-                    String qcData = advertData.Substring(24, 20);
+                    String qcData = advertData.Substring(2, 20);
                     System.Diagnostics.Debug.WriteLine(qcData);
 
                     String badgeIdStr = qcData.Substring(0, 4);
diff --git a/qcbadge/wwwroot/images/10-eb469e40-61c2-11e7-a8ef-aff04cd092f4.png b/qcbadge/wwwroot/images/10-eb469e40-61c2-11e7-a8ef-aff04cd092f4.png
index 67f2227..5bdcc45 100644
Binary files a/qcbadge/wwwroot/images/10-eb469e40-61c2-11e7-a8ef-aff04cd092f4.png and b/qcbadge/wwwroot/images/10-eb469e40-61c2-11e7-a8ef-aff04cd092f4.png differ
diff --git a/qcbadge/wwwroot/images/16-eb478346-61c2-11e7-a8f5-9be54b52f15a.png b/qcbadge/wwwroot/images/16-eb478346-61c2-11e7-a8f5-9be54b52f15a.png
new file mode 100644
index 0000000..df345d0
Binary files /dev/null and b/qcbadge/wwwroot/images/16-eb478346-61c2-11e7-a8f5-9be54b52f15a.png differ
diff --git a/qcbadge/wwwroot/images/2-eb467672-61c2-11e7-a8e7-bfbec3058f18.png b/qcbadge/wwwroot/images/2-eb467672-61c2-11e7-a8e7-bfbec3058f18.png
index 1bcffaf..969ea58 100644
Binary files a/qcbadge/wwwroot/images/2-eb467672-61c2-11e7-a8e7-bfbec3058f18.png and b/qcbadge/wwwroot/images/2-eb467672-61c2-11e7-a8e7-bfbec3058f18.png differ
diff --git a/qcbadge/wwwroot/images/26-eb48f1f4-61c2-11e7-a8ff-43cc47b01ac5.png b/qcbadge/wwwroot/images/26-eb48f1f4-61c2-11e7-a8ff-43cc47b01ac5.png
new file mode 100644
index 0000000..426dee9
Binary files /dev/null and b/qcbadge/wwwroot/images/26-eb48f1f4-61c2-11e7-a8ff-43cc47b01ac5.png differ
diff --git a/qcbadge/wwwroot/images/28-eb49232c-61c2-11e7-a901-ebf4867570bd.png b/qcbadge/wwwroot/images/28-eb49232c-61c2-11e7-a901-ebf4867570bd.png
new file mode 100644
index 0000000..68e413a
Binary files /dev/null and b/qcbadge/wwwroot/images/28-eb49232c-61c2-11e7-a901-ebf4867570bd.png differ
diff --git a/qcbadge/wwwroot/images/3-eb467b68-61c2-11e7-a8e8-bf5dcee8f5a4.png b/qcbadge/wwwroot/images/3-eb467b68-61c2-11e7-a8e8-bf5dcee8f5a4.png
index 2d33a60..e0fd29f 100644
Binary files a/qcbadge/wwwroot/images/3-eb467b68-61c2-11e7-a8e8-bf5dcee8f5a4.png and b/qcbadge/wwwroot/images/3-eb467b68-61c2-11e7-a8e8-bf5dcee8f5a4.png differ
diff --git a/qcbadge/wwwroot/images/33-eb4a6a3e-61c2-11e7-a906-9f652af3f189.png b/qcbadge/wwwroot/images/33-eb4a6a3e-61c2-11e7-a906-9f652af3f189.png
new file mode 100644
index 0000000..59f38ab
Binary files /dev/null and b/qcbadge/wwwroot/images/33-eb4a6a3e-61c2-11e7-a906-9f652af3f189.png differ
diff --git a/qcbadge/wwwroot/images/34-eb4a7fba-61c2-11e7-a907-cb5a4cba0a56.png b/qcbadge/wwwroot/images/34-eb4a7fba-61c2-11e7-a907-cb5a4cba0a56.png
new file mode 100644
index 0000000..e90705d
Binary files /dev/null and b/qcbadge/wwwroot/images/34-eb4a7fba-61c2-11e7-a907-cb5a4cba0a56.png differ
diff --git a/qcbadge/wwwroot/images/35-eb4a9f40-61c2-11e7-a908-ff06d36f3dcd.png b/qcbadge/wwwroot/images/35-eb4a9f40-61c2-11e7-a908-ff06d36f3dcd.png
new file mode 100644
index 0000000..554ebd8
Binary files /dev/null and b/qcbadge/wwwroot/images/35-eb4a9f40-61c2-11e7-a908-ff06d36f3dcd.png differ
diff --git a/qcbadge/wwwroot/images/36-eb4ab2a0-61c2-11e7-a909-075d9873cefd.png b/qcbadge/wwwroot/images/36-eb4ab2a0-61c2-11e7-a909-075d9873cefd.png
new file mode 100644
index 0000000..ecc8fbe
Binary files /dev/null and b/qcbadge/wwwroot/images/36-eb4ab2a0-61c2-11e7-a909-075d9873cefd.png differ
diff --git a/qcbadge/wwwroot/images/4-eb468036-61c2-11e7-a8e9-8fa59b75eeab.png b/qcbadge/wwwroot/images/4-eb468036-61c2-11e7-a8e9-8fa59b75eeab.png
index 8d251f0..371bd2c 100644
Binary files a/qcbadge/wwwroot/images/4-eb468036-61c2-11e7-a8e9-8fa59b75eeab.png and b/qcbadge/wwwroot/images/4-eb468036-61c2-11e7-a8e9-8fa59b75eeab.png differ
diff --git a/qcbadge/wwwroot/images/40-eb4b0dea-61c2-11e7-a90d-1fb8e62fdf32.png b/qcbadge/wwwroot/images/40-eb4b0dea-61c2-11e7-a90d-1fb8e62fdf32.png
new file mode 100644
index 0000000..b00ac74
Binary files /dev/null and b/qcbadge/wwwroot/images/40-eb4b0dea-61c2-11e7-a90d-1fb8e62fdf32.png differ
diff --git a/qcbadge/wwwroot/images/41-eb4b2550-61c2-11e7-a90e-2b83f972e68d.png b/qcbadge/wwwroot/images/41-eb4b2550-61c2-11e7-a90e-2b83f972e68d.png
new file mode 100644
index 0000000..1b1bda1
Binary files /dev/null and b/qcbadge/wwwroot/images/41-eb4b2550-61c2-11e7-a90e-2b83f972e68d.png differ
diff --git a/qcbadge/wwwroot/images/42-eb4b3b58-61c2-11e7-a90f-f73233bbb2e0.png b/qcbadge/wwwroot/images/42-eb4b3b58-61c2-11e7-a90f-f73233bbb2e0.png
new file mode 100644
index 0000000..7e680bf
Binary files /dev/null and b/qcbadge/wwwroot/images/42-eb4b3b58-61c2-11e7-a90f-f73233bbb2e0.png differ