diff --git a/CleanAzureResourceGroups.ps1 b/CleanAzureResourceGroups.ps1
index a23ceca..b0a7ebe 100644
--- a/CleanAzureResourceGroups.ps1
+++ b/CleanAzureResourceGroups.ps1
@@ -1,5 +1,6 @@
 <# script will run on the current selected subscription of the session #>
 
+Login-AzureRMaccount
 $currentSub = Get-AzureSubscription -Current
 Write-Host Script will run on $currentSub.SubscriptionName ($currentSub.SubscriptionId)
 $isOk = Read-Host 'Do you want to continue [Y/N] ?'
@@ -7,9 +8,8 @@ $isOk = Read-Host 'Do you want to continue [Y/N] ?'
 if ($isOk.ToUpper().Equals("Y"))
 {
 
-    Switch-AzureMode -Name AzureResourceManager
 
-    $resourceGroups = Get-AzureResourceGroup
+    $resourceGroups = Get-AzureRmResourceGroup
     $fullAuto = Read-Host 'Do you want to delete all the resource groups which do not have any resources. If you select No you can choose one by one and delete them [Y/N] ?'
 
     $found = 0;
@@ -19,39 +19,32 @@ if ($isOk.ToUpper().Equals("Y"))
     {
         $rgName = $resourceGroup.ResourceGroupName
         
-        $resources = Get-AzureResource -ResourceGroupName $rgName
+        $resources = Find-AzureRmResource -ResourceGroupName $rgName
    
         if ($resources.Count -eq 0)
         {
             $found++
             Write-Host Resource Group " $rgName " does not contain any resources.
-
-            if($fullAuto.ToUpper().Equals("N"))
+			if($fullAuto.ToUpper().Equals("N"))
             {
                 $input = Read-Host 'Do you want to delete it [Y/N] ?'
                 if ($input.ToUpper().Equals("Y"))
                 {
                     Write-Host Deleting Resource Group - $rgName
-                    Remove-AzureResourceGroup -Name $resourceGroup.ResourceGroupName -Force -Verbose
+                    Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force -Verbose
                     Write-Host Deleted Resource Group - $rgName
                     $deleted++
-                }
-            }
-            else
-            {
-                Write-Host Deleting Resource Group - $rgName
-                Remove-AzureResourceGroup -Name $resourceGroup.ResourceGroupName -Force -Verbose
-                Write-Host Deleted Resource Group - $rgName
-                $deleted++
-            }
+				}
+			}
+			else {
+                    Write-Host Deleting Resource Group - $rgName
+                    Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force -Verbose
+                    Write-Host Deleted Resource Group - $rgName
+                    $deleted++
+			}
+			
         }
     }
-
     Write-Host $deleted / $found Resource Groups deleted with no resources
-
-    Switch-AzureMode -Name AzureServiceManagement
-}
-else
-{
-    exit
-}
+	
+} else { exit }