diff --git a/py-scripts/influx2.py b/py-scripts/influx2.py
index 707de5f6..0e561945 100644
--- a/py-scripts/influx2.py
+++ b/py-scripts/influx2.py
@@ -44,7 +44,10 @@ class RecordInflux(LFCliBase):
         self.influx_token = _influx_token
         self.influx_bucket = _influx_bucket
         self.url = "http://%s:%s"%(self.influx_host, self.influx_port)
-        self.client = influxdb_client.InfluxDBClient(url=self.url, token=self.influx_token, org=self.influx_org, debug=_debug_on)
+        self.client = influxdb_client.InfluxDBClient(url=self.url,
+                                                     token=self.influx_token,
+                                                     org=self.influx_org,
+                                                     debug=_debug_on)
         self.write_api = self.client.write_api(write_options=SYNCHRONOUS)
         #print("org: ", self.influx_org)
         #print("token: ", self.influx_token)
diff --git a/py-scripts/recordinflux.py b/py-scripts/recordinflux.py
index 05483a9c..70b7e337 100755
--- a/py-scripts/recordinflux.py
+++ b/py-scripts/recordinflux.py
@@ -21,7 +21,6 @@ if 'py-json' not in sys.path:
     sys.path.append(os.path.join(os.path.abspath('..'), 'py-json'))
 
 from LANforge.lfcli_base import LFCliBase
-from influx import RecordInflux
 import argparse
 
 
@@ -42,9 +41,13 @@ def main():
         --longevity 5h'''
     )
     target_kpi = ['bps rx', 'rx bytes', 'pps rx', 'rx pkts', 'rx drop']
-    parser.add_argument('--influx_user', help='Username for your Influx database', required=True)
-    parser.add_argument('--influx_passwd', help='Password for your Influx database', required=True)
-    parser.add_argument('--influx_db', help='Name of your Influx database', required=True)
+    parser.add_argument('--influx_user', help='Username for your Influx database')
+    parser.add_argument('--influx_passwd', help='Password for your Influx database')
+    parser.add_argument('--influx_token', help='Token for your Influx database', default=None)
+    parser.add_argument('--influx_db', help='Name of your Influx database')
+    parser.add_argument('--influx_bucket', help='Name of your Influx bucket')
+    parser.add_argument('--influx_org', help='Name of your Influx Organization')
+    parser.add_argument('--influx_port', help='Name of your Influx Port', default=8086)
     parser.add_argument('--longevity', help='How long you want to gather data', default='4h')
     parser.add_argument('--device', help='Device to monitor', action='append', required=True)
     parser.add_argument('--monitor_interval', help='How frequently you want to append to your database', default='5s')
@@ -52,15 +55,31 @@ def main():
     args = parser.parse_args()
     monitor_interval = LFCliBase.parse_time(args.monitor_interval).total_seconds()
     longevity = LFCliBase.parse_time(args.longevity).total_seconds()
-    grapher = RecordInflux(_influx_host=args.mgr,
-                           _port=args.mgr_port,
-                           _influx_db=args.influx_db,
-                           _influx_user=args.influx_user,
-                           _influx_passwd=args.influx_passwd)
-    grapher.getdata(longevity=longevity,
-                    devices=args.device,
-                    monitor_interval=monitor_interval,
-                    target_kpi=args.target_kpi)
+    tags=dict()
+    tags['script'] = 'recordinflux'
+    if args.influx_user is None:
+        from influx2 import RecordInflux
+        grapher = RecordInflux(_influx_host=args.mgr,
+                               _influx_port=args.influx_port,
+                               _influx_bucket=args.influx_db,
+                               _influx_token=args.influx_token,
+                               _influx_org=args.influx_org)
+        grapher.monitor_port_data(longevity=longevity,
+                                  devices=args.device,
+                                  monitor_interval=monitor_interval,
+                                  tags=tags)
+
+    else:
+        from influx import RecordInflux
+        grapher = RecordInflux(_influx_host=args.mgr,
+                               _port=args.mgr_port,
+                               _influx_db=args.influx_db,
+                               _influx_user=args.influx_user,
+                               _influx_passwd=args.influx_passwd)
+        grapher.getdata(longevity=longevity,
+                        devices=args.device,
+                        monitor_interval=monitor_interval,
+                        target_kpi=args.target_kpi)
 
 
 if __name__ == "__main__":