diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index c2e999ec62ff..467ac973da5d 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -1105,7 +1105,7 @@ class Import implements ShouldQueue
             throw new MigrationValidatorFailed(json_encode($validator->errors()));
         }
 
-        $quote_repository = new QuoteRepository();
+        $quote_repository = new InvoiceMigrationRepository();
 
         foreach ($data as $resource) {
             $modified = $resource;
@@ -1144,7 +1144,7 @@ class Import implements ShouldQueue
                     $resource['invitations'][$key]['user_id'] = $modified['user_id'];
                     $resource['invitations'][$key]['company_id'] = $this->company->id;
                     $resource['invitations'][$key]['email_status'] = '';
-                    unset($resource['invitations'][$key]['invoice_id']);
+                    unset($resource['invitations'][$key]['quote_id']);
                     unset($resource['invitations'][$key]['id']);
                 }
 
diff --git a/app/PaymentDrivers/GoCardless/ACH.php b/app/PaymentDrivers/GoCardless/ACH.php
index 7aafa628d86d..41bd1fe892cf 100644
--- a/app/PaymentDrivers/GoCardless/ACH.php
+++ b/app/PaymentDrivers/GoCardless/ACH.php
@@ -148,6 +148,7 @@ class ACH implements MethodInterface
         $data['gateway'] = $this->go_cardless;
         $data['amount'] = $this->go_cardless->convertToGoCardlessAmount($data['total']['amount_with_fee'], $this->go_cardless->client->currency()->precision);
         $data['currency'] = $this->go_cardless->client->getCurrencyCode();
+        $data['description'] = ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number');
 
         return render('gateways.gocardless.ach.pay', $data);
     }
diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index 1a7039c27a58..c9494ca3b2b1 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -295,19 +295,26 @@ trait GeneratesCounter
      */
     public function getNextProjectNumber(Project $project) :string
     {
-        $this->resetCompanyCounters($project->company);
+        // 08/12/2021 - allows projects to have client counters.
+        
+        // $this->resetCompanyCounters($project->company);
 
-        $counter = $project->company->settings->project_number_counter;
-        $setting_entity = $project->company->settings->project_number_counter;
+        // $counter = $project->company->settings->project_number_counter;
+        // $setting_entity = $project->company->settings->project_number_counter;
 
-        $project_number = $this->checkEntityNumber(Project::class, $project, $counter, $project->company->settings->counter_padding, $project->company->settings->project_number_pattern);
+        // $project_number = $this->checkEntityNumber(Project::class, $project, $counter, $project->company->settings->counter_padding, $project->company->settings->project_number_pattern);
 
-        $this->incrementCounter($project->company, 'project_number_counter');
+        // $this->incrementCounter($project->company, 'project_number_counter');
 
-        $entity_number = $project_number;
+        // $entity_number = $project_number;
+
+        // return $this->replaceUserVars($project, $entity_number);
+
+        $entity_number = $this->getNextEntityNumber(Project::class, $project->client, false);
 
         return $this->replaceUserVars($project, $entity_number);
 
+
     }