diff --git a/DeviceTenantFinder/Src/DeviceTenantFinder/DeviceTenantFinder.csproj b/DeviceTenantFinder/Src/DeviceTenantFinder/DeviceTenantFinder.csproj
index a6bc8e9..47c89dc 100644
--- a/DeviceTenantFinder/Src/DeviceTenantFinder/DeviceTenantFinder.csproj
+++ b/DeviceTenantFinder/Src/DeviceTenantFinder/DeviceTenantFinder.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DeviceTenantFinder/Src/DeviceTenantFinder/Program.cs b/DeviceTenantFinder/Src/DeviceTenantFinder/Program.cs
index 986d804..c813706 100644
--- a/DeviceTenantFinder/Src/DeviceTenantFinder/Program.cs
+++ b/DeviceTenantFinder/Src/DeviceTenantFinder/Program.cs
@@ -37,13 +37,18 @@ class Program
 
         public static async Task<int> Main(string[] args)
         {
+            string deviceId = string.Empty;
             if (args.Count() != 1)
             {
-                Console.WriteLine("App requires a device id on the command line");
-                return -1;
+                Console.Write("Enter a device id >");
+                deviceId = Console.ReadLine();
+            }
+            else
+            {
+                deviceId = args[0];
             }
 
-            if (args[0].Length != 128)
+            if (deviceId.Length != 128)
             {
                 Console.WriteLine("Device Id Length is expected to be 128 characters, try again");
                 return -1;
@@ -85,7 +90,7 @@ public static async Task<int> Main(string[] args)
                 Devices devices = JsonSerializer.Deserialize<Devices>(result);
                 foreach (Item item in devices.Items)
                 {
-                    if (item.DeviceId.ToLower() == args[0].ToLower())
+                    if (item.DeviceId.ToLower() == deviceId.ToLower())
                     {
                         deviceFound = true;
                         tenantId = tenant.Id;
@@ -105,13 +110,12 @@ public static async Task<int> Main(string[] args)
                 return -1;
             }
 
-            Console.WriteLine($"Device Found   : {args[0]}");
+            Console.WriteLine($"Device Found   : {deviceId}");
             Console.WriteLine($"Tenant Id      : {tenantId}");
             Console.WriteLine($"Tenant Name    : {tenantName}");
             Console.WriteLine($"Product Id     : {productId}");
             Console.WriteLine($"Device Group Id: {deviceGroupId}");
 
-
             return 0;
         }