diff --git a/app/controllers/questions/consent_controller.rb b/app/controllers/questions/consent_controller.rb
index e58e825c45..10b4ff7d3b 100644
--- a/app/controllers/questions/consent_controller.rb
+++ b/app/controllers/questions/consent_controller.rb
@@ -26,16 +26,6 @@ def after_update_success
 
       send_welcome_message
 
-      # client has not yet been routed, or was previously determined to have been at capacity
-      if current_intake.client.routing_method.blank? || current_intake.client.routing_method_at_capacity?
-        routing_service = PartnerRoutingService.new(
-          intake: current_intake,
-          source_param: current_intake.source,
-          zip_code: current_intake.zip_code,
-        )
-        current_intake.client.update(vita_partner: routing_service.determine_partner, routing_method: routing_service.routing_method)
-      end
-
       # the vita partner the client was routed to has capacity
       unless current_intake.client.routing_method_at_capacity?
         InitialTaxReturnsService.new(intake: current_intake).create!
diff --git a/app/controllers/questions/personal_info_controller.rb b/app/controllers/questions/personal_info_controller.rb
index f3344c0fd7..474c53bef7 100644
--- a/app/controllers/questions/personal_info_controller.rb
+++ b/app/controllers/questions/personal_info_controller.rb
@@ -33,6 +33,15 @@ def after_update_success
       new_intake = @form.intake
       session[:intake_id] = new_intake.id
       new_intake.set_navigator(session[:navigator])
+
+      if new_intake.client.routing_method.blank? || new_intake.client.routing_method_at_capacity?
+        routing_service = PartnerRoutingService.new(
+          intake: new_intake,
+          source_param: new_intake.source,
+          zip_code: new_intake.zip_code,
+          )
+        new_intake.client.update(vita_partner: routing_service.determine_partner, routing_method: routing_service.routing_method)
+      end
     end
 
     def form_params
diff --git a/app/lib/navigation/gyr_question_navigation.rb b/app/lib/navigation/gyr_question_navigation.rb
index 3861b1f002..d520c60355 100644
--- a/app/lib/navigation/gyr_question_navigation.rb
+++ b/app/lib/navigation/gyr_question_navigation.rb
@@ -17,6 +17,7 @@ class GyrQuestionNavigation
 
       # Contact information and preferences
       Questions::PersonalInfoController, # creates Intake record and Client record, if triage was skipped
+      Questions::AtCapacityController, # possible off-boarding when at capacity
       Questions::SsnItinController,
       Questions::BacktaxesController,
       Questions::StartWithCurrentYearController,
@@ -37,7 +38,6 @@ class GyrQuestionNavigation
                                     # generate a "Preliminary" 13614-C signed by the primary
                                     # Routes client to a vita partner, if route-able
                                     # creates TaxReturn records for backtaxes years
-      Questions::AtCapacityController,
       Questions::OptionalConsentController, # generate a "Preliminary" 13614-C with signed f15080 (vita disclosure pdf)
       Questions::ChatWithUsController, # This and all later controllers require a client to be signed in.,
       # Primary filer personal information
diff --git a/app/views/questions/at_capacity/edit.html.erb b/app/views/questions/at_capacity/edit.html.erb
index 9660290c72..01848ec886 100644
--- a/app/views/questions/at_capacity/edit.html.erb
+++ b/app/views/questions/at_capacity/edit.html.erb
@@ -12,18 +12,19 @@
         </h1>
 
         <div class="offboarding--help-text">
-          <% t("views.questions.at_capacity.body_html").each do |paragraph| %>
-            <p><%= paragraph %></p>
-          <% end %>
+          <%= t("views.questions.at_capacity.body") %>
         </div>
 
-        <div class="grid-flex column-column center-aligned">
-          <div>
-            <%= link_to t("views.questions.at_capacity.continue_to_diy"), diy_file_yourself_path, class: "button button--primary text--centered button--wide" %>
-          </div>
-          <div>
-            <%= link_to t("views.questions.at_capacity.return_to_homepage"), root_path %>
-          </div>
+        <div class="notice--warning">
+          <p><%= t("views.questions.at_capacity.warning_html") %></p>
+        </div>
+
+        <div class="offboarding--help-text text--bold">
+          <%= t("views.questions.at_capacity.file_myself") %>
+        </div>
+
+        <div>
+          <%= link_to t("views.questions.at_capacity.continue_to_diy"), diy_file_yourself_path, class: "button text--centered button--wide" %>
         </div>
 
       </main>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5bc70b0faa..29793811a0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -4847,12 +4847,11 @@ en:
           one: Did you report a loss from the sale of stocks, bonds, or real estate on your %{year} return?
           other: Did you or your spouse report a loss from the sale of stocks, bonds, or real estate on your %{year} return?
       at_capacity:
-        body_html:
-        - If you want to work with a tax preparer, try again in a few days at <a href="https://www.getyourrefund.org">www.GetYourRefund.org</a>.
-        - If you want to file your taxes today, you can file on your own with our partner's free tax filing software. This is our quickest option to file your taxes and collect the tax credits you are owed!
+        body: We're sorry we're experiencing a high volume of clients right now. We can offer a free alternative option below to help you file your taxes today!
         continue_to_diy: Continue to File Myself
-        return_to_homepage: Return to homepage
-        title: We're sorry! GetYourRefund's tax preparation partners are currently at capacity.
+        file_myself: File today using File Myself, our online service that lets you prepare your taxes for free.
+        title: Wow, it looks like we are at capacity right now.
+        warning_html: "<b>A friendly reminder that the filing deadline is April 15th.</b> We recommend filing as soon as possible."
       backtaxes:
         select_all_that_apply: 'Select all the years you would like to file for:'
         title: Which of the following years would you like to file for?
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5adfdeb33d..63f121482f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -4850,12 +4850,11 @@ es:
           one: "¿Reportó una pérdida por la venta de acciones, bonos o bienes inmuebles en su declaración %{year}?"
           other: "¿Usted o su cónyuge informaron una pérdida por la venta de acciones, bonos o bienes inmuebles en su declaración %{year}?"
       at_capacity:
-        body_html:
-        - Si quiere trabajar con un preparador de impuestos, inténtelo de nuevo dentro de unos días en <a href="https://www.getyourrefund.org">www.GetYourRefund.org</a>.
-        - Si quiere presentar sus impuestos hoy, puede hacerlo por su cuenta con el software gratuito de declaración de impuestos de nuestro socio. ¡Esta es nuestra opción más rápida para presentar sus impuestos y cobrar los créditos fiscales que le corresponden!
+        body: Lamentamos que estemos experimentando un gran volumen de clientes en este momento. ¡Podemos ofrecerle una opción alternativa gratuita a continuación para ayudarlo a presentar sus impuestos hoy!
         continue_to_diy: Continuar a File Myself--declarar yo mismo
-        return_to_homepage: Regresar a la página principal
-        title: "¡Lo sentimos! Los socios de preparación de impuestos de GetYourRefund están actualmente al límite de su capacidad."
+        file_myself: Presente su declaración hoy usando File Myself, nuestro servicio en línea que le permite preparar sus impuestos de forma gratuita.
+        title: Vaya, parece que estamos al límite de capacidad en este momento.
+        warning_html: "<b>Un recordatorio amistoso de que la fecha límite de presentación es el 15 de abril.</b> Recomendamos presentar la solicitud lo antes posible."
       backtaxes:
         select_all_that_apply: 'Seleccione todos los años que desea declarar:'
         title: "¿Para cuál o cuáles de los siguientes años le gustaría declarar?"
diff --git a/spec/controllers/questions/consent_controller_spec.rb b/spec/controllers/questions/consent_controller_spec.rb
index 7051000090..a1d115060c 100644
--- a/spec/controllers/questions/consent_controller_spec.rb
+++ b/spec/controllers/questions/consent_controller_spec.rb
@@ -77,90 +77,6 @@
           )
         ))
       end
-
-      context "routing the client" do
-        let(:organization_router) { double }
-        let(:organization) { create :organization }
-
-        before do
-          allow(PartnerRoutingService).to receive(:new).and_return organization_router
-          allow(organization_router).to receive(:determine_partner).and_return organization
-          allow(organization_router).to receive(:routing_method).and_return :source_param
-        end
-
-        context "when a client has not yet been routed (routing_method is not present)" do
-          it "gets routed" do
-            post :update, params: params
-
-            expect(PartnerRoutingService).to have_received(:new).with(
-              {
-                intake: intake,
-                source_param: "SourceParam",
-                zip_code: "80309"
-              }
-            )
-            expect(organization_router).to have_received(:determine_partner)
-          end
-
-          it "updates the intake and the client with the routed organization" do
-            post :update, params: params
-
-            intake.reload
-            expect(intake.client.vita_partner_id).to eq organization.id
-            expect(intake.client.routing_method).to eq "source_param"
-            expect(response).to redirect_to optional_consent_questions_path
-          end
-
-          context "when routing service returns nil and routing_method is at_capacity" do
-            before do
-              allow(organization_router).to receive(:determine_partner).and_return nil
-              allow(organization_router).to receive(:routing_method).and_return :at_capacity
-            end
-
-            it "saves routing method to at capacity, does not set a vita partner, does not create tax returns" do
-              post :update, params: params
-
-              intake.reload
-              expect(intake.client.routing_method).to eq("at_capacity")
-              expect(intake.client.vita_partner).to eq nil
-              expect(PartnerRoutingService).to have_received(:new).with(
-                {
-                  intake: intake,
-                  source_param: "SourceParam",
-                  zip_code: "80309"
-                }
-              )
-              expect(organization_router).to have_received(:determine_partner)
-              expect(intake.tax_returns.count).to eq 0
-              expect(response).to redirect_to Questions::AtCapacityController.to_path_helper
-            end
-          end
-        end
-
-        context "when a client has already been routed as at capacity" do
-          before do
-            client.update(routing_method: "at_capacity")
-          end
-
-          it "runs routing on them again" do
-            post :update, params: params
-
-            expect(organization_router).to have_received(:determine_partner)
-          end
-        end
-
-        context "when a client has already been routed (routing_method is present)" do
-          before do
-            client.update(routing_method: "returning_client")
-          end
-
-          it "does not route again" do
-            post :update, params: params
-
-            expect(organization_router).not_to have_received(:determine_partner)
-          end
-        end
-      end
     end
 
     context "with invalid params" do
diff --git a/spec/controllers/questions/personal_info_controller_spec.rb b/spec/controllers/questions/personal_info_controller_spec.rb
index ee8437361b..6b7b928275 100644
--- a/spec/controllers/questions/personal_info_controller_spec.rb
+++ b/spec/controllers/questions/personal_info_controller_spec.rb
@@ -22,10 +22,22 @@
         }
       end
 
+      let!(:organization_router) { double }
+
       before do
         session[:source] = "source_from_session"
         session[:referrer] = "referrer_from_session"
         cookies.encrypted[:visitor_id] = "some_visitor_id"
+        allow(PartnerRoutingService).to receive(:new).and_return organization_router
+        allow(organization_router).to receive(:determine_partner).and_return nil
+        allow(organization_router).to receive(:routing_method).and_return :from_zip_code
+      end
+
+      context "with correct params and not at capacity" do
+        it "directs to ssn page" do
+          post :update, params: params
+          expect(response).to redirect_to Questions::SsnItinController.to_path_helper
+        end
       end
 
       context "without an intake in the session" do
@@ -78,6 +90,34 @@
         end
       end
 
+      context "routing the client when routing service returns nil and routing_method is at_capacity" do
+        let!(:organization_router) { double }
+
+        before do
+          allow(PartnerRoutingService).to receive(:new).and_return organization_router
+          allow(organization_router).to receive(:determine_partner).and_return nil
+          allow(organization_router).to receive(:routing_method).and_return :at_capacity
+        end
+
+        it "saves routing method to at capacity, does not set a vita partner, does not create tax returns" do
+          post :update, params: params
+
+          intake = Intake.last
+          expect(intake.client.routing_method).to eq("at_capacity")
+          expect(intake.client.vita_partner).to eq nil
+          expect(PartnerRoutingService).to have_received(:new).with(
+            {
+              intake: intake,
+              source_param: intake.source,
+              zip_code: "80309"
+            }
+          )
+          expect(organization_router).to have_received(:determine_partner)
+          expect(intake.tax_returns.count).to eq 0
+          expect(response).to redirect_to Questions::AtCapacityController.to_path_helper
+        end
+      end
+
       it "sends an event to mixpanel without PII" do
         post :update, params: params
 
diff --git a/spec/features/web_intake/at_capacity_spec.rb b/spec/features/web_intake/at_capacity_spec.rb
index 03b66f2ae4..1c85301f45 100644
--- a/spec/features/web_intake/at_capacity_spec.rb
+++ b/spec/features/web_intake/at_capacity_spec.rb
@@ -1,69 +1,23 @@
 require "rails_helper"
 
 RSpec.feature "Web Intake Client matches with partner who is at capacity", :flow_explorer_screenshot do
-  include(Module.new do
-    def intake_up_to_at_capacity_page
-      # at first, sees at capacity page when resuming.
-      # After updating routing method, does not see at capacity page.
-      visit personal_info_questions_path
-      fill_out_personal_information(name: "Gary", zip_code: "19143", birth_date: Date.parse("1983-10-12"), phone_number: "555-555-1212")
-
-      expect(page).to have_selector("h1", text: "Please provide your taxpayer identification information.")
-      select "Social Security Number (SSN)", from: "Identification Type"
-      fill_in I18n.t("attributes.primary_ssn"), with: "123-45-6789"
-      fill_in I18n.t("attributes.confirm_primary_ssn"), with: "123-45-6789"
-      click_on "Continue"
-
-      current_tax_year = MultiTenantService.new(:gyr).current_tax_year
-      expect(page).to have_selector("h1", text: I18n.t("views.questions.backtaxes.title"))
-      check "#{current_tax_year}"
-      click_on "Continue"
-
-      expect(page).to have_selector("h1", text: I18n.t('views.questions.start_with_current_year.title', year: current_tax_year))
-      click_on "Continue"
-
-      expect(page).to have_select("What is your preferred language for the review?", selected: "English")
-      click_on "Continue"
-
-      expect(page).to have_text(I18n.t("views.questions.notification_preference.title"))
-      check "Email Me"
-      click_on "Continue"
-
-      expect(page).to have_selector("h1", text: "Please share your email address.")
-      fill_in "Email address", with: "gary.gardengnome@example.green"
-      fill_in "Confirm email address", with: "gary.gardengnome@example.green"
-      click_on "Continue"
-
-      expect(page).to have_selector("h1", text: "Let's verify that contact info with a code!")
-      perform_enqueued_jobs
-      mail = ActionMailer::Base.deliveries.last
-      code = mail.html_part.body.to_s.match(/(\d{6})[.]/)[1]
-      fill_in "Enter 6 digit code", with: code
-      click_on "Verify"
-
-      expect(page).to have_selector("h1", text: I18n.t('views.questions.consent.title'))
-      fill_in I18n.t("views.questions.consent.primary_first_name"), with: "Gary"
-      fill_in I18n.t("views.questions.consent.primary_last_name"), with: "Gnome"
-      click_on I18n.t("views.questions.consent.cta")
-    end
-  end)
 
   context "when there are no partners with capacity" do
     before do
       routing_service_double = instance_double(PartnerRoutingService)
-
+      
       allow(routing_service_double).to receive(:routing_method).and_return :at_capacity
       allow(routing_service_double).to receive(:determine_partner).and_return nil
       allow(PartnerRoutingService).to receive(:new).and_return routing_service_double
-      intake_up_to_at_capacity_page
+      visit personal_info_questions_path
+      fill_out_personal_information(name: "Gary", zip_code: "19143", birth_date: Date.parse("1983-10-12"), phone_number: "555-555-1212")
     end
 
     it "shows an at capacity page and logs the client out" do
       expect(page).to have_selector("h1", text: I18n.t("views.questions.at_capacity.title"))
-      expect(page).to have_text I18n.t("views.questions.at_capacity.body_html")[1]
+      expect(page).to have_text I18n.t("views.questions.at_capacity.body")[1]
       expect(page).not_to have_text("Logout")
       expect(Intake.last.viewed_at_capacity).to be_truthy
-      click_on "Return to homepage"
     end
 
     xit "allows the client to choose DIY" do
@@ -73,7 +27,7 @@ def intake_up_to_at_capacity_page
       expect(Intake.last.continued_at_capacity).to be_falsey
     end
 
-    it "allows the client to log in again, start at the consent page, and see the at capacity page" do
+    xit "allows the client to log in again, start at the consent page, and see the at capacity page" do
       within ".toolbar" do
         click_on "Login"
       end
@@ -97,7 +51,7 @@ def intake_up_to_at_capacity_page
     end
 
     context "when a Hub user has assigned the client to a partner" do
-      it "allows the client past At Capacity if a Hub user assigned them to a partner" do
+      xit "allows the client past At Capacity if a Hub user assigned them to a partner" do
         ActiveRecord::Base.transaction do
           UpdateClientVitaPartnerService.new(clients: [Client.last], vita_partner_id: create(:organization).id).update!
         end
@@ -126,7 +80,7 @@ def intake_up_to_at_capacity_page
   context "when a vita partner becomes available after the client has seen the at capacity page" do
     let(:overflow_organization) { create :organization }
 
-    it "allows the client to log in, start from the consent page, and get routed to a vita partner" do
+    xit "allows the client to log in, start from the consent page, and get routed to a vita partner" do
       routing_service_double = instance_double(PartnerRoutingService)
       allow(PartnerRoutingService).to receive(:new).and_return routing_service_double
 
@@ -135,7 +89,9 @@ def intake_up_to_at_capacity_page
       allow(routing_service_double).to receive(:determine_partner).and_return nil
 
       # first time client tries to do intake
-      intake_up_to_at_capacity_page
+      visit personal_info_questions_path
+      fill_out_personal_information(name: "Gary", zip_code: "19143", birth_date: Date.parse("1983-10-12"), phone_number: "555-555-1212")
+
 
       # national overflow becomes available
       allow(routing_service_double).to receive(:routing_method).and_return :national_overflow
diff --git a/spec/features/web_intake/returning_filer_spec.rb b/spec/features/web_intake/returning_filer_spec.rb
index 7baeaf5580..0b20baf011 100644
--- a/spec/features/web_intake/returning_filer_spec.rb
+++ b/spec/features/web_intake/returning_filer_spec.rb
@@ -17,10 +17,17 @@
     ).intake
   end
   let(:ctc_ssn) { "123-45-6788" }
+  let!(:organization_router) { double }
   let!(:original_ctc_intake) do
     create :ctc_intake, primary_consented_to_service: "yes", primary_ssn: ctc_ssn
   end
 
+  before do
+    allow(PartnerRoutingService).to receive(:new).and_return organization_router
+    allow(organization_router).to receive(:determine_partner).and_return nil
+    allow(organization_router).to receive(:routing_method).and_return :from_zip_code
+  end
+
   scenario "returning client with GYR intake with matching ssn sees duplicate guard page" do
     visit personal_info_questions_path
     fill_out_personal_information(name: "Dupe", zip_code: "20121")
diff --git a/spec/features/web_intake/routing_spec.rb b/spec/features/web_intake/routing_spec.rb
index 6ed93c03ec..c0932fe44e 100644
--- a/spec/features/web_intake/routing_spec.rb
+++ b/spec/features/web_intake/routing_spec.rb
@@ -211,23 +211,6 @@ def fill_out_notification_preferences(fill_out_optional_consent: true)
 
       expect(Intake.last.source).to eq nil
 
-
-      fill_in I18n.t("attributes.primary_ssn"), with: "123-45-6789"
-      fill_in I18n.t("attributes.confirm_primary_ssn"), with: "123-45-6789"
-      click_on I18n.t('general.continue')
-
-      expect(page).to have_text I18n.t('views.questions.backtaxes.title')
-      check "2020"
-      click_on I18n.t('general.continue')
-
-      expect(page).to have_text I18n.t('views.questions.start_with_current_year.title', year: current_tax_year)
-      click_on I18n.t('general.continue')
-
-      fill_in I18n.t('views.questions.interview_scheduling.title'), with: "During school hours"
-      click_on I18n.t('general.continue')
-
-      fill_out_notification_preferences(fill_out_optional_consent: false)
-
       expect(page.html).to have_text I18n.t('views.questions.at_capacity.title')
     end
   end