diff --git a/Helpers/EmailFormat.py b/Helpers/EmailFormat.py
index eb51b78..bd60856 100644
--- a/Helpers/EmailFormat.py
+++ b/Helpers/EmailFormat.py
@@ -388,7 +388,7 @@ def EmailBuilder(self, CleanNames, Domain, Format, Verbose=True):
                     LastName = str(name[1])
                     if FirstName and LastName:
                         # now build foramt
-                        LastInitial = str(LastName[-1])
+                        LastInitial = str(LastName[0])
                         BuiltName = str(FirstName) + '.' + \
                             str(LastInitial) + "@" + Domain
                         if Verbose:
@@ -410,7 +410,7 @@ def EmailBuilder(self, CleanNames, Domain, Format, Verbose=True):
                     LastName = str(name[1])
                     if FirstName and LastName:
                         # now build foramt
-                        LastInitial = str(LastName[-1])
+                        LastInitial = str(LastName[0])
                         BuiltName = str(
                             FirstName) + str(LastInitial) + "@" + Domain
                         if Verbose:
@@ -432,8 +432,7 @@ def EmailBuilder(self, CleanNames, Domain, Format, Verbose=True):
                     LastName = str(name[1])
                     if FirstName and LastName:
                         # now build foramt
-                        BuiltName = str(
-                            FirstName) + "_" + str(LastName) + "@" + Domain
+                        BuiltName = FirstName + "_" + LastName + "@" + Domain
                         if Verbose:
                             e = ' [*] Email built: ' + str(BuiltName)
                             print helpers.color(e, firewall=True)
@@ -441,6 +440,8 @@ def EmailBuilder(self, CleanNames, Domain, Format, Verbose=True):
                             BuiltEmails.append(BuiltName)
                 except Exception as e:
                     print e
+            if BuiltEmails:
+                return BuiltEmails
         elif Format == '{first}':
             for name in CleanNames:
                 try:
diff --git a/tests/test_simplyemail_list.py b/tests/test_simplyemail_list.py
index 20060a9..8ec6be4 100644
--- a/tests/test_simplyemail_list.py
+++ b/tests/test_simplyemail_list.py
@@ -66,4 +66,30 @@ def test_emailformat():
     assert result[0] == '{first}_{last}'
     finalemails = ['mad@verisgroup.com']
     result = em.EmailDetect(cleannames, domain, finalemails)
-    assert result[0] == '{first}'
\ No newline at end of file
+    assert result[0] == '{first}'
+    # now test building emails
+    fm = '{f}{last}'
+    emails = em.EmailBuilder(cleannames, domain, fm)
+    assert 'mmax@verisgroup.com' in emails
+    fm = '{f}.{last}'
+    emails = em.EmailBuilder(cleannames, domain, fm)
+    assert 'm.max@verisgroup.com' in emails
+    fm = '{first}{last}'
+    emails = em.EmailBuilder(cleannames, domain, fm)
+    assert 'madmax@verisgroup.com' in emails
+    fm = '{first}.{last}'
+    emails = em.EmailBuilder(cleannames, domain, fm)
+    assert 'mad.max@verisgroup.com' in emails
+    fm = '{first}.{l}'
+    emails = em.EmailBuilder(cleannames, domain, fm)
+    assert 'mad.m@verisgroup.com' in emails
+    fm = '{first}{l}'
+    emails = em.EmailBuilder(cleannames, domain, fm)
+    assert 'madm@verisgroup.com' in emails
+    fm = '{first}_{last}'
+    emails = em.EmailBuilder(cleannames, domain, fm)
+    print emails
+    assert 'mad_max@verisgroup.com' in emails
+    fm = '{first}'
+    emails = em.EmailBuilder(cleannames, domain, fm)
+    assert 'mad@verisgroup.com' in emails