diff --git a/HTTPy.py b/HTTPy.py
index 452984b..68af445 100755
--- a/HTTPy.py
+++ b/HTTPy.py
@@ -8,7 +8,7 @@ inInput = ""
 partDomain = ""
 running = 1
 pingOn = "P"
-whoOn = "w"
+whoOn = "W"
 
    
 def iterate(inArray, pre):
@@ -64,6 +64,11 @@ while running == 1:
             pingOn = "p"
         else:
             pingOn = "P"
+    if inInput == "whois":
+        if pingOn == "W":
+            pingOn = "w"
+        else:
+            pingOn = "W"
     if inInput == "" or inInput == "ping" or inInput == "whois":
         pass
     else:
@@ -76,8 +81,12 @@ while running == 1:
                     ipPing(inInput)
                 else:
                     pass
+                if whoOn == "W":
+                    whois(inInput)
+                else:
+                    pass
             else:
-                whois(inInput)
+                #whois(inInput)
                 #Condense dig calls
                 dig(inInput, "A")
                 dig(inInput, "MX")