diff --git a/pscheduler-test-wifibssid/wifibssid/result-format b/pscheduler-test-wifibssid/wifibssid/result-format
index e304db657d..09b04a5346 100755
--- a/pscheduler-test-wifibssid/wifibssid/result-format
+++ b/pscheduler-test-wifibssid/wifibssid/result-format
@@ -46,13 +46,13 @@ if format == 'text/plain':
         print("")
         print(entry["ssid"] + ":")
         print(f'   Signal: {entry["signal"]}')
-        print(f'   Address: {entry["address"]}') 
-        print(f'   Frequency: {entry["frequency"]}') 
-        print(f'   Quality: {entry["quality"]}')
-        print(f'   Bitrates: {entry["bitrates"]}')
-        print(f'   Encrypted: {entry["encrypted"]}')
-        print(f'   Channel: {entry["channel"]}')
-        print(f'   Mode: {entry["mode"]}') 
+        print(f'   Address: {entry["bssid"]}') 
+        print(f'   Frequency: {entry["freq"]}') 
+        # print(f'   Quality: {entry["quality"]}')
+        # print(f'   Bitrates: {entry["bitrates"]}')
+        # print(f'   Encrypted: {entry["encrypted"]}')
+        # print(f'   Channel: {entry["channel"]}')
+        print(f'   Mode: {entry["flags"]}') 
         print("") 
    
 elif format == 'text/html':
@@ -68,13 +68,13 @@ elif format == 'text/html':
     for entry in result['ssid_list']:
         print(f'    <tr><td><b>SSID</b></td> <td>{entry["ssid"]}</td></tr>')
         print(f'    <tr><td><b>Signal</b></td> <td>{entry["signal"]}</td></tr>') 
-        print(f'    <tr><td><b>Address</b></td> <td>{entry["address"]}</td></tr>')
-        print(f'    <tr><td><b>Frequency</b></td> <td>{entry["frequency"]}</td></tr>')
-        print(f'    <tr><td><b>Quality</b></td> <td>{entry["quality"]}</td></tr>')
-        print(f'    <tr><td><b>Bitrates</b></td> <td>{entry["bitrates"]}</td></tr>')
-        print(f'    <tr><td><b>Encrypted</b></td> <td>{entry["signal"]}</td></tr>')
-        print(f'    <tr><td><b>Channel</b></td> <td>{entry["channel"]}</td></tr>')
-        print(f'    <tr><td><b>Mode</b></td> <td>{entry["mode"]}</td></tr>')
+        print(f'    <tr><td><b>Address</b></td> <td>{entry["bssid"]}</td></tr>')
+        print(f'    <tr><td><b>Frequency</b></td> <td>{entry["freq"]}</td></tr>')
+        # print(f'    <tr><td><b>Quality</b></td> <td>{entry["quality"]}</td></tr>')
+        # print(f'    <tr><td><b>Bitrates</b></td> <td>{entry["bitrates"]}</td></tr>')
+        # print(f'    <tr><td><b>Encrypted</b></td> <td>{entry["signal"]}</td></tr>')
+        # print(f'    <tr><td><b>Channel</b></td> <td>{entry["channel"]}</td></tr>')
+        print(f'    <tr><td><b>Mode</b></td> <td>{entry["flags"]}</td></tr>')
     print('</table>')
 
 
diff --git a/pscheduler-test-wifibssid/wifibssid/validate.py b/pscheduler-test-wifibssid/wifibssid/validate.py
index c82f4c04f4..cf8df1214d 100644
--- a/pscheduler-test-wifibssid/wifibssid/validate.py
+++ b/pscheduler-test-wifibssid/wifibssid/validate.py
@@ -51,8 +51,7 @@
             },
             # If listed here, these parameters MUST be in the test spec.
             "required": [
-                "interface",
-		        "ssid",
+                "interface"
             ],
             # Treat other properties as acceptable.  This should
             # ALWAYS be false.
diff --git a/pscheduler-tool-bssidscanner/bssidscanner/duration b/pscheduler-tool-bssidscanner/bssidscanner/duration
index 2612f43f1e..50595669fa 100644
--- a/pscheduler-tool-bssidscanner/bssidscanner/duration
+++ b/pscheduler-tool-bssidscanner/bssidscanner/duration
@@ -19,7 +19,7 @@ json = pscheduler.json_load(exit_on_error=True);
 
         
 timeout_iso = json.get("timeout", "PT10S")
-timeout = pscheduler.iso8601_as_timedelta(timeout_iso)+datetime.timedelta(seconds=2)
+timeout = pscheduler.iso8601_as_timedelta(timeout_iso)+datetime.timedelta(seconds=1)
 
 pscheduler.succeed_json({
     "duration": pscheduler.timedelta_as_iso8601( timeout )
diff --git a/pscheduler-tool-bssidscanner/bssidscanner/run b/pscheduler-tool-bssidscanner/bssidscanner/run
index f1c8423f30..619baaec44 100755
--- a/pscheduler-tool-bssidscanner/bssidscanner/run
+++ b/pscheduler-tool-bssidscanner/bssidscanner/run
@@ -9,111 +9,115 @@
 # back to the test. Both system and api are able to be used here.
 #
 
+import select
+from os import getpid, makedirs, unlink, access, R_OK, system, listdir, path
 import datetime
-import subprocess
-import json
-import sys
-import time
-import argparse
-import time
-from wifi import Cell #make sure that you have pip installed wifi
-
 import pscheduler
+# import subprocess
+import time
 
-# from stdin
-input = pscheduler.json_load(exit_on_error=True)
-
-# Take input from test spec
-try:
-    interface = input['test']['spec']['interface']
-    ssid = input['test']['spec']['ssid']
-except KeyError:
-    pscheduler.fail('Missing data in input')
-
-# convert the comma separated ssids to a list
-ssid = list(ssid.split(','))
-
-duration = input['test']['spec'].get('duration', 'PT5S')
-duration = pscheduler.timedelta_as_seconds( pscheduler.iso8601_as_timedelta(duration) ) 
-timeout_iso = input['test']['spec'].get('timeout', 'PT10S')
-timeout = pscheduler.timedelta_as_seconds( pscheduler.iso8601_as_timedelta(timeout_iso) )
+#temp file preserved between consecutive runs but not reboots
+WPA_CONFIG_PATH = '/tmp/wpa_supplicant.conf'
+#initializes only when wpa_supplicant starts
+WPA_CTRL_IFACE_BASE = '/var/run/wpa_supplicant'
+ssid_set = set()
+
+# parse config
+pscheduler_input = pscheduler.json_load(exit_on_error=True)
+interface = pscheduler_input['test']['spec'].get('interface')
+get_ssid = pscheduler_input['test']['spec'].get('ssid', None)
+ssid_set = set(get_ssid.split(',')) if get_ssid else None
+duration_iso = pscheduler_input['test']['spec'].get('duration', 'PT5S')
+timeout_iso = pscheduler_input['test']['spec'].get('timeout', 'PT10S')
+timeout = pscheduler.timedelta_as_seconds(pscheduler.iso8601_as_timedelta(timeout_iso))
+duration = pscheduler.timedelta_as_seconds(pscheduler.iso8601_as_timedelta(duration_iso))
 start_time = datetime.datetime.now()
-succeeded = False
 error = ''
 diags = ''
-
-# Run the actual task here:
-def get_all_bssids(interface):
-    """
-    Scan the given interface for all bssids
-    Return a list of all bssids
-    """
-    start_time = time.time()
-    cells = Cell.all(interface) # Specify interface to scan on
-    wifi_list = []
-    for cell in cells:
-        bssid = {}
-        bssid['ssid'] = cell.ssid
-        bssid['signal'] = cell.signal
-        bssid['address'] = cell.address
-        bssid['frequency'] = pscheduler.si_as_number(cell.frequency[:-2])
-        quality_num,quality_denom = cell.quality.split('/')
-        bssid['quality'] = float(quality_num) / float(quality_denom)
-        bssid['bitrates'] = sorted(map(lambda v : pscheduler.si_as_number(v[:-3]), cell.bitrates))
-        bssid['encrypted'] = cell.encrypted
-        bssid['channel'] = cell.channel
-        bssid['mode'] = cell.mode
-        wifi_list.append(bssid)
-    
-    end_time = time.time()
-    elapsed_time = end_time - start_time
-    log_msg = "Scan finished in " + str(elapsed_time)
-    return wifi_list, elapsed_time
-
-"""
-Scan on the given interface
-Output a list of all bssids in json format with the given ssid
-"""
-all_bssids, elapsed_time = get_all_bssids(interface)
 ssid_list = []
-
-# Check complete list for matching ssids
-for bssid in all_bssids:
-    #if no ssids were given then append all the ssids
-    if not ssid:
-        ssid_list.append(bssid)
-    else:
-    #if ssid/ssids were given then only append those 
-        if bssid['ssid'] in ssid:
-            ssid_list.append(bssid)
-
-succeeded = True
-
-# IMPORTANT NOTE: This code puts the process to sleep until the
-# scheduled start time has arrived.  It should be placed after all
-# preparatory code has been executed and immediately before the tool
-# is invoked (for plugins that run other programs) or any activity
-# that does a measurement (for those that don't).
-
-try:
-    pscheduler.sleep_until(input['schedule']['start'])
-except KeyError:
-    pscheduler.fail("Unable to find start time in input")
-
-
+dir_path = path.dirname(WPA_CONFIG_PATH)
+
+# check if interface already exists
+status, res, err = pscheduler.run_program(['wpa_cli', 'status'])
+if status:
+   # create config file and start wpa_supplicant
+   with open(WPA_CONFIG_PATH, 'w') as f:
+       f.write('ctrl_interface='+WPA_CTRL_IFACE_BASE+'\n')
+       f.write('update_config=1\n')
+       f.write('p2p_disabled=1\n')
+   status, out, err = pscheduler.run_program(['wpa_supplicant','-D','nl80211','-B','-i',interface,'-c',WPA_CONFIG_PATH])
+   if status:
+       pscheduler.succeed_json( {
+           'succeeded': False,
+           'diags': out + ' ' + str(status) + ' ' + err,
+           'error': 'failed to initialize interface',
+           'result': None
+    })
+
+# run wpa_cli
+start  = datetime.datetime.now()
+status, res, err = pscheduler.run_program(['wpa_cli', 'scan'])
+if not status:
+    status, res, err = pscheduler.run_program(['wpa_cli', 'scan_result'])
+else:
+    pscheduler.succeed_json( {
+        'succeeded': False,
+        'diags': res,
+        'error': 'wpa_cli scan failed',
+        'result': None
+        } )
+    
+result = res.split('\n')
+
+# account for automatic scanning interval of cli
+while len(result) <= 3:
+    status, res, err = pscheduler.run_program(['wpa_cli', 'scan_result'])
+    result = res.split('\n')
+    time.sleep(0.3)
+
+for i in range(2, len(result)):
+    line = result[i].split('\t')
+    if len(line) == 1:
+        break
+    elif len(line) == 4:
+        bssid, freq, signal, flags = line
+    elif len(line) == 5:
+        bssid, freq, signal, flags, ssid = line
+
+    if not ssid_set or ssid in ssid_set:
+        # retrieve prev ssid if ssid is empty
+        if ssid == '':
+            ssid = ssid_list[-1]['ssid']
+        ssid_list.append({
+            'ssid': ssid,
+            'bssid': bssid,
+            'freq': int(freq),
+            'signal': int(signal),
+            'flags': flags
+            })
 end_time = datetime.datetime.now()
 
+# Check for empty result
+if len(ssid_list) == 0:
+    pscheduler.succeed_json( {
+        'succeeded': False,
+        'diags': '',
+        'error': 'scan completed but returned empty result',
+        'result': None
+        } )
+
 # Organize results into json data
 results = {
-    'succeeded': succeeded,
+    'succeeded': True,
     'result': {
         'schema': 1,
-        'time': pscheduler.timedelta_as_iso8601( end_time - start_time),
-        'succeeded': succeeded,
+        'time': pscheduler.timedelta_as_iso8601(end_time - start_time),
+        'succeeded': True,
         'ssid_list': ssid_list
     },
     'error': error,
-    'diags': diags }
+    'diags': diags
+}
 
-pscheduler.succeed_json(results)
 
+pscheduler.succeed_json(results)
diff --git a/pscheduler-tool-bssidscanner/bssidscanner/run.py b/pscheduler-tool-bssidscanner/bssidscanner/run.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/deb/sudoers b/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/deb/sudoers
new file mode 100644
index 0000000000..af26e32eac
--- /dev/null
+++ b/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/deb/sudoers
@@ -0,0 +1,10 @@
+#
+# pscheduler-tool-bssidscanner
+#
+Cmnd_Alias PSCHEDULER_WPA_SUPPLICANT = /usr/sbin/wpa_supplicant
+pscheduler ALL = (root) NOPASSWD: PSCHEDULER_WPA_SUPPLICANT
+Defaults!PSCHEDULER_WPA_SUPPLICANT !requiretty
+
+Cmnd_Alias PSCHEDULER_WPA_CLI = /usr/sbin/wpa_cli
+pscheduler ALL = (root) NOPASSWD: PSCHEDULER_WPA_CLI
+Defaults!PSCHEDULER_WPA_CLI !requiretty
diff --git a/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/rpm/pscheduler-tool-bssidscanner.spec b/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/rpm/pscheduler-tool-bssidscanner.spec
index 87a066e035..ab4a4cba7b 100644
--- a/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/rpm/pscheduler-tool-bssidscanner.spec
+++ b/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/rpm/pscheduler-tool-bssidscanner.spec
@@ -44,6 +44,24 @@ make \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install
 
+# Enable sudo for this tool
+WPA_SUPP=$(command -v wpa_supplicant)
+WPA_CLI=$(command -v wpa_cli)
+
+mkdir -p $RPM_BUILD_ROOT/%{_pscheduler_sudoersdir}
+cat > $RPM_BUILD_ROOT/%{_pscheduler_sudoersdir}/%{name} <<EOF
+
+#
+# %{name}
+#
+Cmnd_Alias PSCHEDULER_WPA_SUPP = ${WPA_SUPP}
+%{_pscheduler_user} ALL = (root) NOPASSWD: ${WPA_SUPP}
+Defaults!PSCHEDULER_WPA_SUPP !requiretty
+
+Cmnd_Alias PSCHEDULER_WPA_CLI = ${WPA_CLI}
+%{_pscheduler_user} ALL = (root) NOPASSWD: ${WPA_CLI}
+Defaults!PSCHEDULER_WPA_CLI !requiretty
+
 %post
 pscheduler internal warmboot
 
diff --git a/pscheduler-tool-umichwpa/umichwpa/run b/pscheduler-tool-umichwpa/umichwpa/run
index 5e4addee4f..2f9650b300 100755
--- a/pscheduler-tool-umichwpa/umichwpa/run
+++ b/pscheduler-tool-umichwpa/umichwpa/run
@@ -70,10 +70,10 @@ try:
 except KeyError:
     diags.append("Proceeding without a bssid")
 
-try:
-    key_management = input['test']['spec']['key_management']
-except KeyError:
-    diags.append("Proceeding without key_management")
+# try:
+#    key_management = input['test']['spec']['key_management']
+# except KeyError:
+#    diags.append("Proceeding without key_management")
 
 
 try:
@@ -87,94 +87,126 @@ timeout = pscheduler.timedelta_as_seconds( pscheduler.iso8601_as_timedelta(timeo
 succeeded = False
 
 # create a temporary configuration file
-temp = tempfile.TemporaryFile(mode = 'w+t')
+temp = tempfile.NamedTemporaryFile(mode = 'w+t')
 path = temp.name
 try:
-    temp.writelines(['ctrl_interface=DIR=/var/run/wpa_supplicant\n', 'update_config=1\n', 'network={\n'])
+    temp.writelines(['ctrl_interface=DIR=/var/run/wpa_supplicant\n','update_config=1\n', 'country=US\n', 'network={\n'])
     if ssid != '':
-        temp.write('  ssid="' + ssid + '"' + '\n')
+        temp.write('\tssid="{}"\n'.format(ssid))
+    temp.write('\tscan_ssid=1'+'\n')
     if bssid != '':
-        temp.write('  bssid="' + bssid + '"' + '\n')
+        temp.write('\tbssid="{}"\n'.format(bssid))
+    temp.write('\tkey_mgmt=' + 'WPA-EAP'  + '\n')
+    temp.write('\teap=PEAP' + '\n')
+    if username != '':
+        temp.write('\tidentity="{}"\n'.format(username))
     if password != '':
-        temp.write('  psk="' + password + '"' + '\n')
-    if key_management != '':
-        temp.write('  key_mgmt=' + key_management + '\n')
+        temp.write('\tpassword="{}"\n'.format(password))
+    temp.write( '\tphase1="peaplabel=0"\n ' )
+    temp.write( '\tphase2="auth=MSCHAPV2"\n ')
+    # if key_management != '':
+    # temp.write('  key_mgmt=' + 'WPA-EAP'  + '\n')
     temp.write('}')
     #temp.seek(0)
+except:
+    pass
 
-#sleep until designated start time
-try:
-    pscheduler.sleep_until(input['schedule']['start'])
-except KeyError:
-    pscheduler.fail('Unable to find start time in input')
+print("temp file path:" + str(path))
+print("created temp config file")
+
+# sleep until designated start time
+# try:
+# pscheduler.sleep_until(input['schedule']['start'])
+# except KeyError:
+#    pscheduler.fail('Unable to find start time in input')
 
 # check if the EUID is not the root
-if os.geteuid() != 0:
-    need_root = True
+# if os.geteuid() != 0:
+#    need_root = True
 
 #remove the interface file if it exists
-interface_path = '/var/run/wpa_supplicant' + interface
-if os.path.exists(interface_path):
-    need_root = True
-    diags.append('Need root privilage to delete prior interface file')
-    clear_interface = ['rm', interface_path]
-    if need_root:
-        clear_interface.insert(0, 'sudo') 
+# interface_path = '/var/run/wpa_supplicant' + interface
+#if os.path.exists(interface_path):
+#    need_root = True
+#    diags.append('Need root privilage to delete prior interface file')
+#    clear_interface = ['rm', interface_path]
+#     if need_root:
+#        clear_interface.insert(0, 'sudo') 
     # run the commands 
-    status, stdout, stderr = pscheduler.run_program(clear_interface, timeout=timeout)
-    if status != 0:
-        succeeded = False
-        fail_json = { 'succeeded': succeeded,
-                      'error': 'failed to delete old interface file',
-                      'diags':'\n'.join(diags)} }
-        pscheduler.succeed_json(fail_json)
-        error.append("(failed to delete old interface file) Error returned: \n%s" % stderr.strip('\n'))
-    else:
-        succeeded = True
-        diags.append("Successfully deleted old interface file")
-
+#    status, stdout, stderr = pscheduler.run_program(clear_interface, timeout=timeout)
+#    if status != 0:
+#        succeeded = False
+#        fail_json = { 'succeeded': succeeded,
+#                      'error': 'failed to delete old interface file',
+#                      'diags':'\n'.join(diags)}
+#        pscheduler.succeed_json(fail_json)
+#        error.append("(failed to delete old interface file) Error returned: \n%s" % stderr.strip('\n'))
+#    else:
+#        succeeded = True
+#        diags.append("Successfully deleted old interface file")
+
+# print('delete old interface')
 # reset the need root flag as root might not be needed next time
 need_root = False
 
+wpa_status = ["wpa_cli", "status"]
+# if need_root:
+#    wpa_status.insert(0, 'sudo')
+
+status, stdout, stderr = pscheduler.run_program(wpa_status, timeout=timeout)
+print("************STATUS***********")
+print(stdout, stderr)
+
 #kill all previous wpa_supplicants
 kill_wpa = ['killall', 'wpa_supplicant']
-if need_root: 
-    diags.insert('Need root privelage to kill all wpa supplicant processes before starting a new one')
-    kill_wpa.insert(0, 'sudo')
+#if need_root: 
+#    diags.insert('Need root privelage to kill all wpa supplicant processes before starting a new one')
+#    kill_wpa.insert(0, 'sudo')
 status, stdout, stderr = pscheduler.run_program(kill_wpa, timeout=timeout)
+print(stdout,stderr)
+
+wpa_status = ["wpa_cli", "status"]
+# if need_root:
+#    wpa_status.insert(0, 'sudo')
+
+status, stdout, stderr = pscheduler.run_program(wpa_status, timeout=timeout)
+print("************STATUS***********")
+print(stdout, stderr)
 
 #run wpa to authenticate
 start_time = datetime.datetime.now()
-wpa_auth = ['wpa_supplicant', '-i', interface, '-c', path, '-d', driver, '-B']
-if need_root: 
-    wpa_auth.insert(0, 'sudo')
+wpa_auth = ['wpa_supplicant', '-i', str(interface), '-c', str(path), '-d', str(driver), '-B']
+# if need_root: 
+#    wpa_auth.insert(0, 'sudo')
 status, stdout, stderr = pscheduler.run_program(wpa_auth, timeout=timeout)
+print(stdout, stderr)
 
 if status != 0:
     error.append('Error returned: \n%s' % stderr.strip('\n'))
     succeeded = False
     fail_json = { 'succeeded': succeeded,
-              'error': 'failed to run wpa_supplicant',
-              'diags':'\n'.join(diags)} }
+              'error': 'failed to run wpa_supplicant'+str(error),
+              'diags':'\n'.join(diags)}
         
-    pscheduler.succeed_json(fail_json
+    pscheduler.succeed_json(fail_json)
 
 else:
     diags.append(stdout)
 
 #use wpa_cli to check if it was intiizlized correctly
 wpa_status = ["wpa_cli", "status"]
-if need_root:
-    wpa_status.insert(0, 'sudo')
+# if need_root:
+#    wpa_status.insert(0, 'sudo')
 
 status, stdout, stderr = pscheduler.run_program(wpa_status, timeout=timeout)
-    
+print("************STATUS***********")
+print(stdout, stderr)
 if status != 0:
     error.append('Error returned: \n%s' % stderr.strip('\n'))
     succeeded = False
     fail_json = { 'succeeded': succeeded,
               'error': 'failed to run wpa_cli to validate the authentication',
-              'diags':'\n'.join(diags)} }
+              'diags':'\n'.join(diags)}
     
     succeeded = False
 else:
@@ -193,7 +225,7 @@ results = {
     'result': {
         'schema': 1,
         'time': pscheduler.timedelta_as_iso8601( end_time - start_time),
-        'succeeded': succeeded
+        'succeeded': succeeded,
         'authenticated': authenticated
     },
     'error': error,