diff --git a/web/src/components/FlappSurveys.vue b/web/src/components/FlappSurveys.vue
index 23b6e0d3d..78f53fbac 100644
--- a/web/src/components/FlappSurveys.vue
+++ b/web/src/components/FlappSurveys.vue
@@ -28,9 +28,9 @@
             <lawyer-party-step v-if="getCurrentStepIndex() == 20" v-bind:step="getStep(20)"></lawyer-party-step>
             <remove-lawyer-party-step v-if="getCurrentStepIndex() == 21" v-bind:step="getStep(21)"></remove-lawyer-party-step>
             <affidavit-step v-if="getCurrentStepIndex() == 22" v-bind:step="getStep(22)"></affidavit-step>
-            <electronic-filing-statement-step v-if="getCurrentStepIndex() == 23" v-bind:step="getStep(23)"></electronic-filing-statement-step>
+            <!-- <electronic-filing-statement-step v-if="getCurrentStepIndex() == 23" v-bind:step="getStep(23)"></electronic-filing-statement-step> -->
 
-            <step-submit v-if="getCurrentStepIndex() == 24" v-bind:step="getStep(24)"></step-submit>    
+            <step-submit v-if="getCurrentStepIndex() == 23" v-bind:step="getStep(23)"></step-submit>    
         </main>
     </div>
 </template>
@@ -55,7 +55,7 @@ import OtherFormStep from "./steps/otherFamilyForms/OtherFormStep.vue";
 import AddressChangeStep from "./steps/addressChange/AddressChangeStep.vue";
 import DiscontinuanceStep from "./steps/discontinuance/DiscontinuanceStep.vue";
 import IntentionProceedStep from "./steps/intentionProceed/IntentionProceedStep.vue";
-import ElectronicFilingStatementStep from "./steps/electronicFilingStatement/ElectronicFilingStatementStep.vue";
+// import ElectronicFilingStatementStep from "./steps/electronicFilingStatement/ElectronicFilingStatementStep.vue";
 import AffidavitStep from "./steps/affidavit/AffidavitStep.vue";
 import RequestSchedulingStep from "./steps/requestScheduling/RequestSchedulingStep.vue";
 import RemoveLawyerPartyStep from "./steps/noticeRemoveLawyerParty/RemoveLawyerPartyStep.vue";
@@ -93,8 +93,8 @@ import * as surveyEnv from "@/components/survey/survey-glossary";
         RemoveLawyerChildStep,
         LawyerPartyStep,
         RemoveLawyerPartyStep,
-        AffidavitStep,
-        ElectronicFilingStatementStep
+        AffidavitStep
+        // ElectronicFilingStatementStep
     }
 })
 
diff --git a/web/src/components/status/MigrateStore.ts b/web/src/components/status/MigrateStore.ts
index ab6d47f32..1a6542b63 100644
--- a/web/src/components/status/MigrateStore.ts
+++ b/web/src/components/status/MigrateStore.ts
@@ -223,7 +223,7 @@ export class MigrateStore{
         pathwayCompleted.noticeLawyerParty = false;
         pathwayCompleted.noticeRemoveLawyerParty = false;
         pathwayCompleted.affidavit = false;
-        pathwayCompleted.electronicFilingStatement = false;
+        // pathwayCompleted.electronicFilingStatement = false;
 
         pathwayCompleted.other = false;
         //TODO: add the other pathway
diff --git a/web/src/components/steps/affidavit/AffidavitStep.vue b/web/src/components/steps/affidavit/AffidavitStep.vue
index 504c8c004..c1e3e67e4 100644
--- a/web/src/components/steps/affidavit/AffidavitStep.vue
+++ b/web/src/components/steps/affidavit/AffidavitStep.vue
@@ -1,11 +1,13 @@
 <template>
     <step-base v-bind:step="step">    
-        <affidavit                v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.Affidavit" />
-        <about-affiant            v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.AboutAffiant" />
-        <your-story-aff           v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.YourStoryAFF" />
-        <filing-aff               v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.FilingAFF" />
-        <review-your-answers-aff  v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.ReviewYourAnswersAFF"/>
-        <preview-forms-aff        v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.PreviewFormsAFF"/> 
+        <affidavit                        v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.Affidavit" />
+        <about-affiant                    v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.AboutAffiant" />
+        <your-story-aff                   v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.YourStoryAFF" />
+        <filing-aff                       v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.FilingAFF" />
+        <electronic-filing-statement-aff  v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.ElectronicFilingStatementAFF" />
+        <review-your-answers-aff          v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.ReviewYourAnswersAFF"/>
+        <preview-forms-aff                v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.PreviewFormsAFF"/>
+        <preview-forms-efsp               v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.PreviewFormsEFSP"/> 
     </step-base>
 </template>
 
@@ -21,8 +23,10 @@ import Affidavit from "./Affidavit.vue";
 import AboutAffiant from "./AboutAffiant.vue";
 import YourStoryAff from "./YourStoryAFF.vue";
 import FilingAff from "./FilingAFF.vue";
+import ElectronicFilingStatementAff from "./ElectronicFilingStatementAFF.vue";
 import ReviewYourAnswersAff from "./reviewAFF/ReviewYourAnswersAFF.vue";
 import PreviewFormsAff from "./reviewAFF/PreviewFormsAFF.vue";
+import PreviewFormsEfsp from "./reviewAFF/PreviewFormsEFSP.vue";
 
 import { stepInfoType } from "@/types/Application";
 import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages";
@@ -34,8 +38,10 @@ import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages";
         AboutAffiant,
         YourStoryAff,
         FilingAff,
+        ElectronicFilingStatementAff,
         ReviewYourAnswersAff,
-        PreviewFormsAff
+        PreviewFormsAff,
+        PreviewFormsEfsp
     }
 })
 export default class AffidavitStep extends Vue {
diff --git a/web/src/components/steps/affidavit/ElectronicFilingStatementAFF.vue b/web/src/components/steps/affidavit/ElectronicFilingStatementAFF.vue
new file mode 100644
index 000000000..9a43390c1
--- /dev/null
+++ b/web/src/components/steps/affidavit/ElectronicFilingStatementAFF.vue
@@ -0,0 +1,161 @@
+<template>
+    <page-base :disableNext="disableNextButton" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >   
+        <survey v-bind:survey="survey"></survey>
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+import * as SurveyVue from "survey-vue";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import * as surveyEnv from "@/components/survey/survey-glossary";
+import surveyJson from "./forms/electronic-filing-statement-aff.json";
+import PageBase from "../PageBase.vue";
+
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+import { stepsAndPagesNumberInfoType } from '@/types/Application/StepsAndPages';
+
+@Component({
+    components:{
+        PageBase
+    }
+})
+export default class ElectronicFilingStatementAff extends Vue {
+    
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    @applicationState.Action
+    public UpdateCommonStepResults!: (newCommonStepResults) => void
+
+    survey = new SurveyVue.Model(surveyJson);
+    currentStep =0;
+    currentPage =0;    
+    disableNextButton = false;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);
+    }
+
+    created() {
+        this.disableNextButton = false;       
+    }
+
+    mounted(){
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){        
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }
+    
+    public addSurveyListener(){
+        this.survey.onValueChanged.add((sender, options) => {
+
+            if(options.name == "ApplicantName") {
+                this.$store.commit("Application/setApplicantName", this.survey.data["ApplicantName"]);
+                this.UpdateCommonStepResults({data:{'applicantName':this.survey.data["ApplicantName"]}})
+            }
+        })
+    }
+    
+    public reloadPageInformation() {
+    
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;            
+
+        if (this.step.result?.electronicFilingStatementAffSurvey) {            
+            this.survey.data = this.step.result.electronicFilingStatementAffSurvey.data;   
+                     
+            Vue.filter('scrollToLocation')(this.$store.state.Application.scrollToLocationName);            
+        } else {
+            this.survey.setValue('OtherPartyInfoEfsp',[]); 
+            this.survey.setValue('PartyInfoEfsp',[]); 
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);       
+    }    
+
+    public mergeRespondants(){
+
+        const respondentNames = [];
+
+        if(this.$store.state.Application.steps[0].result && this.$store.state.Application.steps[0].result.respondents){
+            const respondents = this.$store.state.Application.steps[0].result.respondents        
+            respondentNames.push(...respondents)
+        }
+
+        if(this.survey.data?.Lawyer){
+
+            const applicantIsLawyer = this.survey.data.Lawyer == 'y';
+
+            if (applicantIsLawyer){
+
+                if(this.survey.data?.PartyInfoEfsp && this.survey.data?.PartyInfoEfsp.length>0){
+                    const respondentNamesEfsp = this.survey.data.PartyInfoEfsp.map(party=>party.name)
+                    respondentNames.push(...respondentNamesEfsp)
+                } 
+
+            } else {
+                if(this.survey.data?.OtherPartyInfoEfsp && this.survey.data?.OtherPartyInfoEfsp.length>0){
+                    const respondentNamesEfsp = this.survey.data.OtherPartyInfoEfsp.map(otherParty=>otherParty.name)
+                    respondentNames.push(...respondentNamesEfsp)
+                } 
+            }
+        }        
+        
+        const fullNamesArray =[];
+        for(const name of respondentNames ){
+            fullNamesArray.push(Vue.filter('getFullName')(name))
+        }
+
+        const uniqueArray = respondentNames.filter(function(item, index) {
+            const fullName = Vue.filter('getFullName')(item)
+            return fullNamesArray.indexOf(fullName) == index;
+        })
+        
+        this.UpdateCommonStepResults({data:{'respondents':uniqueArray}})
+    }
+   
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        if(!this.survey.isCurrentPageHasErrors) {
+            Vue.prototype.$UpdateGotoNextStepPage()
+        }
+    }  
+    
+    beforeDestroy() {
+
+        this.mergeRespondants();
+
+        if(this.survey.data?.["ApplicantName"]) {
+            this.$store.commit("Application/setApplicantName", this.survey.data["ApplicantName"]);
+            this.UpdateCommonStepResults({data:{'applicantName':this.survey.data["ApplicantName"]}})
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, true);
+        
+        this.UpdateStepResultData({step:this.step, data: {electronicFilingStatementAffSurvey: Vue.filter('getSurveyResults')(this.survey, this.currentStep, this.currentPage)}})
+    }
+}
+</script>
diff --git a/web/src/components/steps/affidavit/FilingAFF.vue b/web/src/components/steps/affidavit/FilingAFF.vue
index d72252db4..890ecb1c1 100644
--- a/web/src/components/steps/affidavit/FilingAFF.vue
+++ b/web/src/components/steps/affidavit/FilingAFF.vue
@@ -17,7 +17,7 @@ import { electronicFilingDocumentInfoType, stepInfoType, stepResultInfoType } fr
 import { namespace } from "vuex-class";   
 import "@/store/modules/application";
 import { stepsAndPagesNumberInfoType } from '@/types/Application/StepsAndPages';
-import { toggleStep } from '@/components/utils/TogglePages';
+import { togglePages, toggleStep } from '@/components/utils/TogglePages';
 const applicationState = namespace("Application");
 
 @Component({
@@ -73,17 +73,17 @@ export default class FilingAff extends Vue {
     public addSurveyListener(){
         this.survey.onValueChanged.add((sender, options) => {
 
-            this.determineSteps();            
+            this.determinePages();            
             
             
         })
     }
 
-    public determineSteps(){
+    public determinePages(){
 
         if (this.survey.data?.sworn && this.steps[this.stPgNo.OTHER._StepNo].result?.otherFormsSurvey?.data?.filingMethod){
             const eFiling = this.steps[this.stPgNo.OTHER._StepNo].result.otherFormsSurvey.data.filingMethod == 'eFile';
-            toggleStep(this.stPgNo.EFSP._StepNo, this.survey.data.sworn == 'y' && eFiling);
+            togglePages([this.stPgNo.AFF.ElectronicFilingStatementAFF], this.survey.data.sworn == 'y' && eFiling, this.currentStep);
         }
             
     }
@@ -103,7 +103,7 @@ export default class FilingAff extends Vue {
             const eFiling = this.steps[this.stPgNo.OTHER._StepNo].result.otherFormsSurvey.data.filingMethod == 'eFile';           
             this.survey.setVariable('eFiling', eFiling)
         } 
-        this.determineSteps(); 
+        this.determinePages(); 
         
         Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);       
     }
@@ -120,14 +120,14 @@ export default class FilingAff extends Vue {
 
     public setEfsDocumentList(){
        
-        const efsDocumentList: electronicFilingDocumentInfoType[] = this.steps[this.stPgNo.GETSTART._StepNo].result?.efsDocuments?.length>0?this.steps[this.stPgNo.GETSTART._StepNo].result.efsDocuments:[];
+        const efsDocumentList: electronicFilingDocumentInfoType[] = this.steps[this.stPgNo.GETSTART._StepNo].result?.affEfsDocuments?.length>0?this.steps[this.stPgNo.GETSTART._StepNo].result.affEfsDocuments:[];
       
         if (this.step.result.aboutAffiantSurvey?.data?.ApplicantName){
             const applicantName = this.step.result.aboutAffiantSurvey.data.ApplicantName
             efsDocumentList.push({documentName: 'Affidavit', efsApplicantName: applicantName});
         }
               
-       this.UpdateCommonStepResults({data:{'efsDocuments':efsDocumentList}});
+       this.UpdateCommonStepResults({data:{'affEfsDocuments':efsDocumentList}});
     }
     
     beforeDestroy() {   
diff --git a/web/src/components/steps/affidavit/forms/electronic-filing-statement-aff.json b/web/src/components/steps/affidavit/forms/electronic-filing-statement-aff.json
new file mode 100644
index 000000000..c4774166e
--- /dev/null
+++ b/web/src/components/steps/affidavit/forms/electronic-filing-statement-aff.json
@@ -0,0 +1,119 @@
+{
+  "title": "Electronic Filing Statement",
+  "pages": [
+    {
+        "name": "Electronic Filing Statement",
+        "description": "<a target='_blank' href='https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/120_2020#section193'>Rule 193</a> states that an affidavit or other signed document that is being filed for evidentiary purposes must be accompanied by an <a target='_blank' href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa768.pdf?forcedownload=true'>Electronic Filing Statement in Form 51</a>. This pathway will help you complete it.<br><br>The Electronic Filing Statement is used to advise the court that the document you are filing electronically shows an original signature of the person identified and that the electronic version appears to be a true copy of the original paper version.<br><br>You must keep the original paper version of the document until the earliest of<ol style='list-style-type: lower-roman'><li>the date the proceeding, including any appeals, is completed</li><li>the date the appeal period has expired, if no appeal is filed</li><li>the date on which a judge orders the paper version be filed</li></ol>Note: If you are swearing or affirming the affidavit over video, please refer to <a href='http://www.provincialcourt.bc.ca/downloads/Practice%20Directions/NP%2020%20Affidavits%20for%20use%20in%20Court%20Proceedings.pdf' target='_blank'>NP21 Affidavits for use in Court Proceedings</a> to make sure you meet the necessary requirements of the Provincial Court.",
+        "elements": [
+            {
+                "type": "yesno",
+                "name": "Lawyer",
+                "title": "Are you a lawyer filing the affidavit on behalf of a party?",
+                "isRequired": true
+            },
+            {
+                "type": "panel",
+                "name": "ApplicantLawyerContactPanel",
+                "visible": false,
+                "visibleIf": "{Lawyer} = 'y'",
+                "elements": [
+                    {
+                        "type": "personname",
+                        "name": "ApplicantName",
+                        "title": "What is your full name?",
+                        "description": "This is the name of the lawyer. If you are filing out this form for the lawyer, fill in their name.",                  
+                        "isRequired": true,    
+                        "visible": false,
+                        "visibleIf": "{Lawyer} = 'y'",          
+                        "defaultSubstitution": "(Applicant Name)",
+                        "descFirstName": "First Name is also known as Given Name",
+                        "descMiddleName": "If you have more than one Middle Name, write them all in this box with spaces separating your Middle Names",
+                        "descLastName": "Last Name is also known as Family Name or Surname"
+                    },
+                    {
+                        "type": "panel",
+                        "name": "PartyPanelEfsp",             
+                        "elements": [
+                            {
+                                "isRequired": true,  
+                                "visible": false,
+                                "visibleIf": "{Lawyer} = 'y'",
+                                "type": "paneldynamic",
+                                "name": "PartyInfoEfsp",
+                                "title": "<div style = 'color: #556077; font-size: 1.25em; line-height: 1.2;'>What is the name of the party you are representing?</b>",
+                                "description": "Copy the name from a filed document.",                            
+                                "templateElements": [
+                                {
+                                    "type": "personname",
+                                    "name": "name",
+                                    "title": " ",
+                                    "titleLocation": "hidden"
+                                }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "type": "panel",
+                "name": "ApplicantPartyContactPanel",
+                "visible": false,
+                "visibleIf": "{Lawyer} = 'n'",
+                "elements": [
+                    {
+                        "type": "personname",
+                        "name": "ApplicantName",
+                        "title": "What is your full name?",
+                        "description": "This is the name of the party who is filing the affidavit. If you are filing out this form for the party, fill in their name.<br>Copy the name from any filed document.",                  
+                        "isRequired": true,        
+                        "visible": false,
+                        "visibleIf": "{Lawyer} = 'n'",      
+                        "defaultSubstitution": "(Applicant Name)",
+                        "descFirstName": "First Name is also known as Given Name",
+                        "descMiddleName": "If you have more than one Middle Name, write them all in this box with spaces separating your Middle Names",
+                        "descLastName": "Last Name is also known as Family Name or Surname"
+                    }                
+                ]
+            },
+            {
+                "type": "panel",
+                "name": "ContactInformationOtherPartyPanel",             
+                "elements": [
+                    {
+                        "isRequired": true,  
+                        "type": "paneldynamic",
+                        "name": "OtherPartyInfoEfsp",                        
+                        "title": "<div style = 'color: #556077; font-size: 1.25em; line-height: 1.2;'>What is the full name of the other party?</b>",
+                        "description": "Copy the name from any filed document.",                            
+                        "templateElements": [
+                            {
+                                "type": "personname",
+                                "name": "name",
+                                "title": " ",
+                                "titleLocation": "hidden"
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "type": "checkbox",
+                "name": "StatementConfirmation",
+                "title": "Please confirm the following statement, if true:",
+                "description": "The original paper version of the document being submitted for filing electronically appears to have the original signature of the person identified as signing it and I have no reason to believe that the signature on the document is not their signature.<br><br>The version of the document that is being submitted for filing electronically appears to be a true copy of the original paper version of the document and I have no reason to believe that it is not a true copy of the original paper version.",
+                "choices": [
+                    {
+                        "value": "confirm",
+                        "text": "I confirm"
+                    }
+                ],
+                "isRequired": true
+            } 
+        ],
+      "title": "Electronic Filing Statement"
+    }
+  ],
+  "showQuestionNumbers": "off",
+  "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/affidavit/reviewAFF/PreviewFormsAFF.vue b/web/src/components/steps/affidavit/reviewAFF/PreviewFormsAFF.vue
index 8353fa068..6153d287b 100644
--- a/web/src/components/steps/affidavit/reviewAFF/PreviewFormsAFF.vue
+++ b/web/src/components/steps/affidavit/reviewAFF/PreviewFormsAFF.vue
@@ -39,7 +39,8 @@ export default class PreviewFormsAff extends Vue {
         this.disableNext = true;        
         this.currentStep = this.$store.state.Application.currentStep;
         this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;
-        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, 50, false);       
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, 50, false);  
+            
         if(this.checkErrorOnPages([this.stPgNo.OTHER._StepNo, this.stPgNo.AFF._StepNo])) this.dataReady = true;
         window.scrollTo(0, 0);
     }   
@@ -59,7 +60,7 @@ export default class PreviewFormsAff extends Vue {
 
     public checkErrorOnPages(steps){
 
-        const optionalLabels = ["Next Steps", "Review and Print", "Review and Save", "Review and Submit","Preview Forms", "File"]
+        const optionalLabels = ["Next Steps", "Review and Print", "Review and Save", "Review and Submit","Preview Form 45","Preview Form 51", "File"]
         for(const stepIndex of steps){
             const step = this.$store.state.Application.steps[stepIndex]
             if(step.active){
diff --git a/web/src/components/steps/affidavit/reviewAFF/PreviewFormsEFSP.vue b/web/src/components/steps/affidavit/reviewAFF/PreviewFormsEFSP.vue
new file mode 100644
index 000000000..bd491e74e
--- /dev/null
+++ b/web/src/components/steps/affidavit/reviewAFF/PreviewFormsEFSP.vue
@@ -0,0 +1,101 @@
+<template>
+    <div v-if="dataReady" >
+        <page-base :disableNext="disableNext" v-on:onPrev="onPrev()" v-on:onNext="onNext()">           
+            <form51 @enableNext="EnableNext"/>
+        </page-base>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue} from 'vue-property-decorator';
+import { namespace } from "vuex-class"; 
+
+import Form51 from  "./pdf/Form51.vue"
+import PageBase from "@/components/steps/PageBase.vue";
+  
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages"
+
+@Component({
+    components:{       
+        Form51,
+        PageBase
+    }
+})
+export default class PreviewFormsEfsp extends Vue {
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;    
+
+    currentStep = 0;
+    currentPage = 0;
+    disableNext = true;
+    dataReady = false;    
+
+    mounted(){
+        this.dataReady = false;
+        this.disableNext = true;        
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, 50, false);
+        
+        const affPageNumber = this.stPgNo.AFF.PreviewFormsAFF;
+        
+        let nonCompleteForm = false;
+        let nonCompleteFormPage = 0;
+        
+        const pageForm = this.$store.state.Application.steps[this.stPgNo.AFF._StepNo].pages[affPageNumber]
+        if(pageForm.active && pageForm.progress !=100){
+            nonCompleteForm = true;
+            nonCompleteFormPage = affPageNumber            
+        }
+
+        if(nonCompleteForm){
+            this.$store.commit("Application/setCurrentStepPage", {currentStep: this.stPgNo.AFF._StepNo, currentPage: nonCompleteFormPage});
+        }
+        else if(this.checkErrorOnPages([this.stPgNo.COMMON._StepNo, this.stPgNo.AFF._StepNo])) 
+            this.dataReady = true;
+        
+        if(this.checkErrorOnPages([this.stPgNo.OTHER._StepNo, this.stPgNo.AFF._StepNo])) this.dataReady = true;
+        window.scrollTo(0, 0);
+    }   
+
+    public EnableNext(){
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, 100, false);
+        this.disableNext=false;        
+    }
+
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        Vue.prototype.$UpdateGotoNextStepPage()
+    }
+
+    public checkErrorOnPages(steps){
+
+        const optionalLabels = ["Next Steps", "Review and Print", "Review and Save", "Review and Submit","Preview Form 45","Preview Form 51", "File"]
+        for(const stepIndex of steps){
+            const step = this.$store.state.Application.steps[stepIndex]
+            if(step.active){
+                for(const page of step.pages){
+                    if(page.active && page.progress!=100 && optionalLabels.indexOf(page.label) == -1){
+                        this.$store.commit("Application/setCurrentStep", step.id);
+                        this.$store.commit("Application/setCurrentStepPage", {currentStep: step.id, currentPage: page.key });                        
+                        return false;
+                    }
+                }
+            }            
+        }
+        return true;        
+    }
+
+    beforeDestroy() {
+        const progress = this.dataReady && !this.disableNext? 100: 50
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, progress, true);
+    }
+}
+</script>
\ No newline at end of file
diff --git a/web/src/components/steps/affidavit/reviewAFF/RequiredFormEFSP.ts b/web/src/components/steps/affidavit/reviewAFF/RequiredFormEFSP.ts
new file mode 100644
index 000000000..52a929ee2
--- /dev/null
+++ b/web/src/components/steps/affidavit/reviewAFF/RequiredFormEFSP.ts
@@ -0,0 +1,26 @@
+import store from '@/store';
+
+export function whichForm(stepAffResult?) {
+
+    const requiredForm = ['P45'];
+    let resultAff = stepAffResult
+
+    const stPgNo = store.state.Application.stPgNo;
+
+    if(!stepAffResult){                
+        const stepAFF = store.state.Application.steps[stPgNo.AFF._StepNo] 
+        resultAff = stepAFF.result
+    }
+  
+    if(resultAff?.filingAffSurvey?.data?.sworn && store.state.Application.steps[stPgNo.OTHER._StepNo].result?.otherFormsSurvey?.data?.filingMethod){
+        
+        const eFiling = store.state.Application.steps[stPgNo.OTHER._StepNo].result.otherFormsSurvey.data.filingMethod == 'eFile';
+        const sworn = resultAff?.filingAffSurvey?.data?.sworn == 'y';        
+
+        if(sworn && eFiling){
+            requiredForm.push('P51');
+        }			
+
+    }   
+    return requiredForm;          
+}
\ No newline at end of file
diff --git a/web/src/components/steps/affidavit/reviewAFF/ReviewYourAnswersAFF.vue b/web/src/components/steps/affidavit/reviewAFF/ReviewYourAnswersAFF.vue
index d29fac35d..19625f065 100644
--- a/web/src/components/steps/affidavit/reviewAFF/ReviewYourAnswersAFF.vue
+++ b/web/src/components/steps/affidavit/reviewAFF/ReviewYourAnswersAFF.vue
@@ -7,6 +7,8 @@
 <script lang="ts">
 import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
 
+import {whichForm} from './RequiredFormEFSP';
+
 import { stepInfoType } from "@/types/Application";
 import PageBase from "@/components/steps/PageBase.vue";
 
@@ -43,19 +45,57 @@ export default class ReviewYourAnswersAff extends Vue {
     currentPage =0;
     pageHasError = false;
 
+    form45 = false;
+    form51 = false;
 
     @Watch('pageHasError')
     nextPageChange(newVal) 
     {
-        togglePages([this.stPgNo.AFF.PreviewFormsAFF], !this.pageHasError, this.currentStep);
         if(this.pageHasError) this.UpdatePathwayCompleted({pathway:"affidavit", isCompleted:false})
-        Vue.filter('setSurveyProgress')(null, this.currentStep, this.stPgNo.AFF.PreviewFormsAFF,  50, false);
-        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, this.pageHasError? 50: 100, false);
+        this.toggleFormPages();
+        this.setFormsProgress(); 
     }
 
     mounted(){
         this.pageHasError = false;
+        const requiredForm = whichForm();
+        this.form45 = requiredForm.includes('P45');
+        this.form51 = requiredForm.includes('P51');
+        
+        // TODO: do we need this?
+        // for(const form of ['51']){
+        //     if(requiredForm.includes('P'+form) == false){
+        //         Vue.filter('removeRequiredDocuments')('agreementEnfrc'+form)
+        //     }
+        // }
+        
         this.reloadPageInformation();
+        this.checkStepHasError();
+    }
+
+    public toggleFormPages(){
+        togglePages([this.stPgNo.AFF.PreviewFormsAFF], !this.pageHasError && this.form45, this.currentStep);
+        togglePages([this.stPgNo.AFF.PreviewFormsEFSP], !this.pageHasError && this.form51, this.currentStep);        
+    }
+
+    public setFormsProgress(){
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.stPgNo.AFF.PreviewFormsAFF,  50, false);
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.stPgNo.AFF.PreviewFormsEFSP,  50, false);      
+        
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, this.pageHasError? 50: 100, false);
+    }
+
+    public checkStepHasError(){
+
+        const optionalLabels = ["Preview Form 45","Preview Form 51"];        
+        const step = this.$store.state.Application.steps[this.currentStep];
+
+        for(const page of step.pages){
+            if(page.active && page.progress!=100 && optionalLabels.indexOf(page.label) == -1){
+                this.pageHasError = true;
+                break;
+            }
+        }
     }
 
     public handlePageHasError(event){
@@ -68,14 +108,13 @@ export default class ReviewYourAnswersAff extends Vue {
         this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;
         
         if(this.$store.state.Application.steps[this.currentStep].pages[this.currentPage].progress<100){            
-           Vue.filter('setSurveyProgress')(null, this.currentStep, this.stPgNo.AFF.PreviewFormsAFF,  50, false);
+            this.setFormsProgress();
         }
 
         this.questionResults = getQuestionResults([this.stPgNo.OTHER._StepNo, this.stPgNo.AFF._StepNo], this.currentStep)
            
         Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, this.pageHasError? 50: 100, false);
-        togglePages([this.stPgNo.AFF.PreviewFormsAFF], !this.pageHasError, this.currentStep); 
-        
+        this.toggleFormPages();
     }
     
     public onPrev() {
diff --git a/web/src/components/steps/affidavit/reviewAFF/pdf/Form51.vue b/web/src/components/steps/affidavit/reviewAFF/pdf/Form51.vue
new file mode 100644
index 000000000..5c550bd86
--- /dev/null
+++ b/web/src/components/steps/affidavit/reviewAFF/pdf/Form51.vue
@@ -0,0 +1,106 @@
+<template>
+    <div v-if="dataReady">
+        <b-card id="print" style="border:1px solid; border-radius:5px;" bg-variant="white" class="mt-4 mb-4 container" no-body>
+            <form-51-layout v-bind:result="result"/>
+        </b-card>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator';
+import { namespace } from "vuex-class";   
+import moment from 'moment';
+
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import Form51Layout from "./Form51Layout.vue"
+import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages";
+
+@Component({
+    components:{        
+        Form51Layout
+    }
+})
+export default class Form51 extends Vue {
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+    
+    @applicationState.Action
+    public UpdatePathwayCompleted!: (changedpathway) => void
+
+    result;
+    dataReady = false;     
+   
+    mounted(){
+        this.dataReady = false;
+        this.result = this.getEFSPResultData();       
+        this.dataReady = true;
+        Vue.nextTick(()=> this.onPrint())
+    }   
+           
+    public onPrint() { 
+
+        const pdf_type = Vue.filter('getPathwayPdfType')("electronicFilingStatement");
+        const pdf_name = "electronic-filing-statement";       
+        const el = document.getElementById("print");
+
+        const applicationId = this.$store.state.Application.id;
+        const bottomLeftText = `"PFA768    `+moment().format("MMMM D, YYYY")+` \\a           Form 51";`;
+        const bottomRightText = `" "`
+        const url = '/survey-print/'+applicationId+'/?name=' + pdf_name + '&pdf_type='+pdf_type+'&version=1.0&noDownload=true'
+        const pdfhtml = Vue.filter('printPdf')(el.innerHTML, bottomLeftText, bottomRightText );
+
+        const body = {
+            'html':pdfhtml,
+            'json_data':this.result
+        }       
+        
+        const options = {
+            responseType: "blob",
+            headers: {
+            "Content-Type": "application/json",
+            }
+        }  
+
+        this.$http.post(url,body, options)
+        .then(res => {
+            const currentDate = moment().format();
+            this.$store.commit("Application/setLastPrinted", currentDate); 
+            this.UpdatePathwayCompleted({pathway:"electronicFilingStatement", isCompleted:true});
+
+            this.$emit('enableNext',true)                   
+        },err => {
+            console.error(err);        
+        });
+    }
+ 
+    public getEFSPResultData() {         
+        
+        const result = Object.assign({},this.$store.state.Application.steps[0].result); 
+        for(const stepIndex of [this.stPgNo.OTHER._StepNo, this.stPgNo.AFF._StepNo]){
+            const stepResults = this.$store.state.Application.steps[stepIndex].result
+            for(const stepResultInx in stepResults){
+                if(stepResults[stepResultInx])
+                    result[stepResultInx]=stepResults[stepResultInx].data; 
+            }
+        }        
+        
+        const applicationLocation = this.$store.state.Application.applicationLocation;
+        const userLocation = this.$store.state.Common.userLocation;
+       
+        if(applicationLocation)
+            Object.assign(result, result,{applicationLocation: applicationLocation}); 
+        else
+            Object.assign(result, result,{applicationLocation: userLocation});
+
+        
+        return result;
+    } 
+
+}
+</script>
+<style scoped lang="scss" src="@/styles/_pdf.scss">
+
+</style>
\ No newline at end of file
diff --git a/web/src/components/steps/affidavit/reviewAFF/pdf/Form51Layout.vue b/web/src/components/steps/affidavit/reviewAFF/pdf/Form51Layout.vue
new file mode 100644
index 000000000..7f1360f92
--- /dev/null
+++ b/web/src/components/steps/affidavit/reviewAFF/pdf/Form51Layout.vue
@@ -0,0 +1,262 @@
+<template>
+    <div v-if="dataReady">
+
+<!-- <Page 1> -->
+<!-- <HEADER> -->
+        <div  class="form-header-reloc">
+            <b style="color:#FFF; font-size:1px; width:0.1rem; height:0.1rem; margin:0; padding:0;">i</b>
+            <div style="float:left; display: inline-block;">
+                <div style="font-size:13pt;"><b>Electronic Filing Statement</b></div>               
+                <div style="font-size:10pt;"><b>FORM 51</b></div>
+                <div>Provincial Court Family Rules</div>
+                <div>Rule 193</div>
+            </div>
+            <div style="float:right;">
+                <b-table
+                    :items="[{name:'REGISTRY LOCATION:', value:result.applicationLocation},{name:'COURT FILE NUMBER:', value: existingFileNumber}]"
+                    :fields="[{key:'name',tdClass:'border-dark text-center align-middle'},{key:'value',tdClass:'border-dark text-center align-middle'}]"
+                    small
+                    bordered
+                    thead-class="d-none">
+                        <template v-slot:cell(name)="data">
+                            <div style="font-size:6pt; margin:.1rem 0;">{{data.value}}</div>                                           
+                        </template>
+                        <template v-slot:cell(value)="data">
+                            <div style="font-size:7pt !important; color:#000;">{{data.value}}</div>                                           
+                        </template>
+                </b-table>                
+            </div>
+        </div> 
+        
+<!-- <1> -->
+        <section>
+
+            <div style="text-indent:5px;display:inline; font-size: 9pt;"> 
+                <i>Select the applicable option and complete the required information</i>
+            </div> 
+            <div class="marginleft2p5vue" style="margin:0.25rem 0 0 1.5rem;">
+                <check-box 
+                    class="marginleft" 
+                    checkbox="" 
+                    inline="inline" 
+                    boxMargin="0" 
+                    style="display:inline;" 
+                    :check="isLawyer?'yes':''" 
+                    text="I"/>
+                <underline-form 
+                    style="text-indent:0;margin-left:.25rem;display:inline-block;" 
+                    textwidth="10rem" 
+                    beforetext="" 
+                    hint="(full name of person)" 
+                    :text="isLawyer?lawyerName:''"/>   
+                <underline-form 
+                    style="text-indent:2px;display:inline-block; font-size: 9pt;" 
+                    textwidth="20rem" 
+                    beforetext="am the lawyer for" 
+                    hint="(full name of party/parties)" 
+                    :italicHint="false" :text="isLawyer?parties:''"/>                
+            </div>
+
+            <div class="marginleft2p5vue" style="margin:0.5rem 0 0 1.5rem;">
+                <check-box 
+                    class="marginleft" 
+                    checkbox="" 
+                    inline="inline" 
+                    boxMargin="0" 
+                    style="display:inline;" 
+                    :check="!isLawyer?'yes':''" 
+                    text="I"/>
+                <underline-form 
+                    style="text-indent:0;margin-left:.25rem;display:inline-block;" 
+                    textwidth="15rem" 
+                    beforetext="" 
+                    hint="(full name of party)" 
+                    :text="!isLawyer?applicant:''"/>   
+                <div style="display:inline-block;margin-left:1.25rem;">, am not represented by a lawyer</div>
+            </div>
+        </section>
+           
+        <div style="margin-top: 1rem;"></div>  
+
+<!-- <2> -->   
+        <section > 
+            <underline-form 
+                style="margin-top:0.5rem; text-indent:2px;display:inline-block;" 
+                textwidth="32.5rem" 
+                beforetext="The other party is" 
+                hint="full name of the other party/parties" 
+                :italicHint="false" 
+                :text="otherParties"/> 
+        </section>
+        
+
+           
+        <div style="margin-top: 1rem;"></div>
+    <!-- <3> -->
+    
+        <section>
+
+            <div style="text-indent:5px;display:inline; font-size: 9pt;"> 
+                I advise as follows:
+            </div> 
+            <div style="margin:0.25rem 0 0 1.5rem;">
+                
+                <underline-form 
+                    style="text-indent:2px;margin-left:0rem;display:inline-block;" 
+                    textwidth="17rem" 
+                    beforetext="The" 
+                    hint="name and identifying description of document" 
+                    :text="documents"/>   
+                <div style="text-indent:5px;display:inline; font-size: 9pt;"> 
+                    is being submitted for filing electronically <i>(add if applicable)</i>
+                </div>
+
+                <underline-form 
+                    style="text-indent:2px;margin: 0.5rem 0 0 -1rem;display:inline-block; font-size: 9pt;" 
+                    textwidth="20rem" 
+                    beforetext=" on behalf of" 
+                    hint="(full name of party/parties)" 
+                    :italicHint="false" :text="isLawyer?parties:''"/>                
+            </div>
+            
+        </section>
+
+        <div style="margin-left: 1.5rem; display:inline-block; font-size: 9pt; margin-top: 1rem;"> 
+            The original paper version of the document being submitted for filing electronically 
+            appears to bear an original signature of the person identified as the signatory and 
+            I have no reason to believe that the signature on the document is not the signature 
+            of the identified signatory.
+        </div>
+
+        <div style="margin-left: 1.5rem; display:inline-block; font-size: 9pt; margin-top: 1rem;"> 
+            The version of the document that is being submitted for filing electronically appears 
+            to be a true copy of the original paper version of the document and I have no reason 
+            to believe that it is not a true copy of the original paper version.
+        </div>
+
+
+        <div style="margin:2rem 0 0 1rem; width:96.37%; font-weight:bold; font-size: 16pt; padding:0.5rem;font-family:BCSans">
+            <underline-form 
+                style="text-indent:2px;display:inline-block;margin:0 5rem 0.5rem 0;" 
+                textwidth="12rem" 
+                beforetext="" 
+                hint="Date (mmm/dd/yyyy)" text=""/>
+            <underline-form 
+                style="text-indent:2px;display:inline-block;" 
+                textwidth="20rem" 
+                beforetext="" 
+                hint="Signature" 
+                text=""/>               
+            
+        </div>
+
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator';
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import UnderlineForm from "@/components/utils/PopulateForms/components/UnderlineForm.vue";
+import CheckBox from "@/components/utils/PopulateForms/components/CheckBox.vue";
+import { nameInfoType } from "@/types/Application/CommonInformation";
+import { getLocationInfo } from '@/components/utils/PopulateForms/PopulateCommonInformation';
+import { electronicFilingStatementDataInfoType } from '@/types/Application/Affidavit';
+
+@Component({
+    components:{
+        UnderlineForm,
+        CheckBox       
+    }
+})
+
+export default class Form51Layout extends Vue {
+
+    @Prop({required:true})
+    result!: any;    
+    
+    @applicationState.State
+    public applicantName!: nameInfoType;    
+
+    dataReady = false;  
+
+    isLawyer = false;
+    lawyerName = '';
+    parties = '';
+    otherParties = '';
+    applicant = '';
+    documents = '';
+
+    existingFileNumber = '';
+    
+    mounted(){
+        this.dataReady = false;
+        this.extractInfo();       
+        this.dataReady = true;        
+    }
+   
+    public extractInfo(){   
+        console.log(this.result)     
+        this.getDocumentInfo();    
+        this.getFilingInfo();    
+        this.existingFileNumber = getLocationInfo(this.result.otherFormsFilingLocationSurvey);        
+    } 
+
+    public getFilingInfo(){    
+        
+        this.isLawyer = false;
+        this.lawyerName = '';
+        this.parties = '';
+        this.otherParties = '';
+        this.applicant = '';
+
+        if(this.result?.electronicFilingStatementAffSurvey){
+
+            let electronicFilingStatement = {} as electronicFilingStatementDataInfoType;
+
+            electronicFilingStatement = this.result.electronicFilingStatementAffSurvey; 
+            
+            this.isLawyer = electronicFilingStatement.Lawyer == 'y';
+
+            if (this.isLawyer){
+
+                this.lawyerName = electronicFilingStatement.ApplicantName?Vue.filter('getFullName')(electronicFilingStatement.ApplicantName):'';
+                const partiesList = [];
+                for (const party of electronicFilingStatement.PartyInfoEfsp){
+                    partiesList.push(Vue.filter('getFullName')(party.name))
+                }
+                this.parties = partiesList.join(', ')
+            } else {
+                this.applicant = electronicFilingStatement.ApplicantName?Vue.filter('getFullName')(electronicFilingStatement.ApplicantName):'';
+            }           
+
+            const otherPartiesList = [];
+            for (const otherParty of electronicFilingStatement.OtherPartyInfoEfsp){
+                otherPartiesList.push(Vue.filter('getFullName')(otherParty.name))
+            }
+            this.otherParties = otherPartiesList.join(', ')
+           
+        }            
+    }
+
+    public getDocumentInfo(){       
+        
+        this.documents = '';        
+
+        if(this.result?.affEfsDocuments?.length>0){
+            const documentName = this.result.affEfsDocuments[0].documentName;
+            const applicant = Vue.filter('getFullName')(this.result.affEfsDocuments[0].efsApplicantName);
+            this.documents = documentName + ' of ' + applicant;
+        }        
+    
+    }    
+ 
+}
+</script>
+<style scoped lang="scss" src="@/styles/_pdf.scss">
+
+   
+</style>
\ No newline at end of file
diff --git a/web/src/components/steps/agreementEnfrc/reviewAE/PreviewForm29Enfrc.vue b/web/src/components/steps/agreementEnfrc/reviewAE/PreviewForm29Enfrc.vue
index 776df053a..256e442d4 100644
--- a/web/src/components/steps/agreementEnfrc/reviewAE/PreviewForm29Enfrc.vue
+++ b/web/src/components/steps/agreementEnfrc/reviewAE/PreviewForm29Enfrc.vue
@@ -25,11 +25,7 @@ import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages";
 export default class PreviewForm29Enfrc extends Vue {
 
     @applicationState.State
-    public stPgNo!: stepsAndPagesNumberInfoType;
-
-    
-
-    
+    public stPgNo!: stepsAndPagesNumberInfoType;    
 
     currentStep = 0;
     currentPage = 0;
diff --git a/web/src/components/steps/agreementEnfrc/reviewAE/ReviewYourAnswersEnfrc.vue b/web/src/components/steps/agreementEnfrc/reviewAE/ReviewYourAnswersEnfrc.vue
index d39cb459d..5a9746615 100644
--- a/web/src/components/steps/agreementEnfrc/reviewAE/ReviewYourAnswersEnfrc.vue
+++ b/web/src/components/steps/agreementEnfrc/reviewAE/ReviewYourAnswersEnfrc.vue
@@ -35,11 +35,7 @@ export default class ReviewYourAnswersEnfrc extends Vue {
     step!: stepInfoType;
 
     @applicationState.State
-    public stPgNo!: stepsAndPagesNumberInfoType;
-
-    
-
-    
+    public stPgNo!: stepsAndPagesNumberInfoType;    
 
     @applicationState.Action
     public UpdatePathwayCompleted!: (changedpathway) => void
diff --git a/web/src/components/steps/electronicFilingStatement/reviewEFSP/pdf/Form51Layout.vue b/web/src/components/steps/electronicFilingStatement/reviewEFSP/pdf/Form51Layout.vue
index 268afd3f4..6af2cf453 100644
--- a/web/src/components/steps/electronicFilingStatement/reviewEFSP/pdf/Form51Layout.vue
+++ b/web/src/components/steps/electronicFilingStatement/reviewEFSP/pdf/Form51Layout.vue
@@ -246,9 +246,9 @@ export default class Form51Layout extends Vue {
         //TODO: update once we know how to handle multiple efs docs
         this.documents = '';        
 
-        if(this.result?.efsDocuments?.length>0){
-            const documentName = this.result.efsDocuments[0].documentName;
-            const applicant = Vue.filter('getFullName')(this.result.efsDocuments[0].efsApplicantName);
+        if(this.result?.affEfsDocuments?.length>0){
+            const documentName = this.result.affEfsDocuments[0].documentName;
+            const applicant = Vue.filter('getFullName')(this.result.affEfsDocuments[0].efsApplicantName);
             this.documents = documentName + ' of ' + applicant;
         }        
     
diff --git a/web/src/components/steps/otherFamilyForms/CompleteOtherForms.vue b/web/src/components/steps/otherFamilyForms/CompleteOtherForms.vue
index d74184fa7..e2d246b2a 100644
--- a/web/src/components/steps/otherFamilyForms/CompleteOtherForms.vue
+++ b/web/src/components/steps/otherFamilyForms/CompleteOtherForms.vue
@@ -372,13 +372,14 @@ export default class CompleteOtherForms extends Vue {
                 Vue.filter('setSurveyProgress')(null, step, page, 50, false);
                 toggleStep(step, false);
                 pdf_type=Vue.filter('fullNameToPdfType')(formName)
-            }else if(formName=='Electronic Filing Statement'){
-                const step = this.stPgNo.EFSP._StepNo;
-                const page = this.stPgNo.EFSP.PreviewFormsEFSP;
-                Vue.filter('setSurveyProgress')(null, step, page, 50, false);
-                toggleStep(step, false);
-                pdf_type=Vue.filter('fullNameToPdfType')(formName);
             }
+            // else if(formName=='Electronic Filing Statement'){
+            //     const step = this.stPgNo.EFSP._StepNo;
+            //     const page = this.stPgNo.EFSP.PreviewFormsEFSP;
+            //     Vue.filter('setSurveyProgress')(null, step, page, 50, false);
+            //     toggleStep(step, false);
+            //     pdf_type=Vue.filter('fullNameToPdfType')(formName);
+            // }
             
             if(pdf_type) await this.removeGeneratedPDF(pdf_type)
         }
diff --git a/web/src/components/steps/otherFamilyForms/OtherFormFilingLocation.vue b/web/src/components/steps/otherFamilyForms/OtherFormFilingLocation.vue
index f920c0873..c08eb9918 100644
--- a/web/src/components/steps/otherFamilyForms/OtherFormFilingLocation.vue
+++ b/web/src/components/steps/otherFamilyForms/OtherFormFilingLocation.vue
@@ -205,7 +205,7 @@ export default class OtherFormFilingLocation extends Vue {
         toggleStep(this.stPgNo.NLPR._StepNo, this.requiredGuidedPathways.includes("noticeRemoveLawyerParty"));
         toggleStep(this.stPgNo.AFF._StepNo, this.requiredGuidedPathways.includes("affidavit"));
         togglePages([this.stPgNo.AFF.FilingAFF], this.eFilingAffidavit, this.stPgNo.AFF._StepNo);
-        toggleStep(this.stPgNo.EFSP._StepNo, this.requiredGuidedPathways.includes("electronicFilingStatement"));
+        //toggleStep(this.stPgNo.EFSP._StepNo, this.requiredGuidedPathways.includes("electronicFilingStatement"));
         
     }   
 
diff --git a/web/src/components/steps/otherFamilyForms/OtherForms.vue b/web/src/components/steps/otherFamilyForms/OtherForms.vue
index e28949eee..9343fa0a2 100644
--- a/web/src/components/steps/otherFamilyForms/OtherForms.vue
+++ b/web/src/components/steps/otherFamilyForms/OtherForms.vue
@@ -251,7 +251,7 @@ export default class OtherForms extends Vue {
     }
 
     public resetSteps(){ //TODO add all new steps here    
-        toggleSteps([this.stPgNo.SUBMIT._StepNo, this.stPgNo.NCD._StepNo, this.stPgNo.NDT._StepNo, this.stPgNo.NPR._StepNo, this.stPgNo.RQS._StepNo, this.stPgNo.TRIS._StepNo, this.stPgNo.NLC._StepNo, this.stPgNo.NLCR._StepNo, this.stPgNo.NLP._StepNo, this.stPgNo.NLPR._StepNo, this.stPgNo.AFF._StepNo, this.stPgNo.EFSP._StepNo], false);
+        toggleSteps([this.stPgNo.SUBMIT._StepNo, this.stPgNo.NCD._StepNo, this.stPgNo.NDT._StepNo, this.stPgNo.NPR._StepNo, this.stPgNo.RQS._StepNo, this.stPgNo.TRIS._StepNo, this.stPgNo.NLC._StepNo, this.stPgNo.NLCR._StepNo, this.stPgNo.NLP._StepNo, this.stPgNo.NLPR._StepNo, this.stPgNo.AFF._StepNo], false);
     }
 
     public determineSteps(){
diff --git a/web/src/components/steps/submit/ResultPages/checklists/Checklists.vue b/web/src/components/steps/submit/ResultPages/checklists/Checklists.vue
index 30c8f96f2..3f3fee91a 100644
--- a/web/src/components/steps/submit/ResultPages/checklists/Checklists.vue
+++ b/web/src/components/steps/submit/ResultPages/checklists/Checklists.vue
@@ -130,7 +130,7 @@ export default class Checklists extends Vue {
         {name:'AFET',   title:'Application About Enforcement',                                      pdfName:'Checklist_for_Application_About_Enforcement.pdf'},
         {name:'RDET',   title:'Request to File a Determination of Parenting Coordinator',           pdfName:'Checklist_for_Request_to_File_a_Determination_of_Parenting_Coordinator.pdf'},
         {name:'RORD',   title:'Request to File an Order',                                           pdfName:'Checklist_for_Request_to_File_an_Order.pdf'},
-        {name:'WRA',    title:'Request to File an Order',                                           pdfName:'Checklist_for_Written_Response_to_Application.pdf'},
+        {name:'WRA',    title:'Written Response to Application',                                    pdfName:'Checklist_for_Written_Response_to_Application.pdf'},
         {name:'RFLM',   title:'Reply to Application About a Family Law Matter',                     pdfName:'Checklist_for_Reply_to_Family_Law_Matter.pdf'},
         {name:'OTHER',  title:'Other Forms',                                                        pdfName:'Checklist_for_Other_Forms.pdf'},        
         {name:'FS',     title:'Financial Statement',                                                pdfName:'Checklist_for_Financial_Statement.pdf'},
diff --git a/web/src/components/steps/submit/components/OtherFormList.vue b/web/src/components/steps/submit/components/OtherFormList.vue
index 75fc01027..77d9a7cfe 100644
--- a/web/src/components/steps/submit/components/OtherFormList.vue
+++ b/web/src/components/steps/submit/components/OtherFormList.vue
@@ -61,6 +61,9 @@ export default class OtherFormList extends Vue {
     @applicationState.State
     public pathwayCompleted!: pathwayCompletedInfoType;    
 
+    @applicationState.Action
+    public UpdateCommonStepResults!: (newCommonStepResults) => void
+
     selected="";
     currentStep = 0;
 
@@ -98,9 +101,24 @@ export default class OtherFormList extends Vue {
         if (affIndex >=0 && this.type == 'Submit'){            
             const affFilingInfo = this.$store.state.Application.steps[this.stPgNo.AFF._StepNo].result?.filingAffSurvey?.data;              
             affRequiresSignature = affFilingInfo?.sworn == 'n';
-            this.requiresEfsp = affFilingInfo?.sworn == 'y';
+            this.requiresEfsp = affFilingInfo?.sworn == 'y';   
+            existingOrdersInfo[affIndex].doNotIncludePdf = true;  
+            
+            // if (affRequiresSignature){
+
+            //     existingOrdersInfo[affIndex].doNotIncludePdf = true;                
+
+            // } else {
+
+            //     existingOrdersInfo[affIndex].doNotIncludePdf = false;
+            // }
+
+            this.UpdateCommonStepResults({data:{'existingOrders':existingOrdersInfo}});
+            Vue.nextTick(() => Vue.prototype.$saveChanges() );
+
         } 
         
+        
         this.formsListTemplate = [ 
             { name:'P2',   appName:'noticeIntentionProceed',       pdfType: Vue.filter('getPathwayPdfType')("noticeIntentionProceed"),      chkSteps:[this.stPgNo.OTHER._StepNo,this.stPgNo.NPR._StepNo],       color:"danger", title:"Notice of Intention to Proceed (Form 2)",         requiresSignature: false, requiresSwear: false},                              
             { name:'P22',  appName:'trialReadinessStatement',      pdfType: Vue.filter('getPathwayPdfType')("trialReadinessStatement"),     chkSteps:[this.stPgNo.OTHER._StepNo,this.stPgNo.TRIS._StepNo],      color:"danger", title:"Trial Readiness Statement (Form 22)",             requiresSignature: false, requiresSwear: false},                              
@@ -112,7 +130,7 @@ export default class OtherFormList extends Vue {
             { name:'P45',  appName:'affidavit',                    pdfType: Vue.filter('getPathwayPdfType')("affidavit"),                   chkSteps:[this.stPgNo.OTHER._StepNo,this.stPgNo.AFF._StepNo],       color:"danger", title:"Affidavit – General (Form 45)",                   requiresSignature: affRequiresSignature, requiresSwear: this.requiresEfsp},            
             { name:'P46',  appName:'noticeOfAddressChange',        pdfType: Vue.filter('getPathwayPdfType')("noticeOfAddressChange"),       chkSteps:[this.stPgNo.OTHER._StepNo,this.stPgNo.NCD._StepNo],       color:"danger", title:"Notice of Address Change (Form 46)",              requiresSignature: false, requiresSwear: false},            
             { name:'P50',  appName:'noticeDiscontinuance',         pdfType: Vue.filter('getPathwayPdfType')("noticeDiscontinuance"),        chkSteps:[this.stPgNo.OTHER._StepNo,this.stPgNo.NDT._StepNo],       color:"danger", title:"Notice of Discontinuance (Form 50)",              requiresSignature: ndtRequiresSignature, requiresSwear: false},
-            { name:'P51',  appName:'electronicFilingStatement',    pdfType: Vue.filter('getPathwayPdfType')("electronicFilingStatement"),   chkSteps:[this.stPgNo.OTHER._StepNo,this.stPgNo.EFSP._StepNo],      color:"danger", title:"Electronic Filing Statement (Form 51)",           requiresSignature: true, requiresSwear: false}
+            { name:'P51',  appName:'electronicFilingStatement',    pdfType: Vue.filter('getPathwayPdfType')("electronicFilingStatement"),   chkSteps:[this.stPgNo.OTHER._StepNo,this.stPgNo.AFF._StepNo],      color:"danger", title:"Electronic Filing Statement (Form 51)",           requiresSignature: true, requiresSwear: false}
         ];
 
         this.currentStep = this.$store.state.Application.currentStep;
diff --git a/web/src/filters/index.ts b/web/src/filters/index.ts
index cbf8d0615..4d06586b8 100644
--- a/web/src/filters/index.ts
+++ b/web/src/filters/index.ts
@@ -16,7 +16,7 @@ Vue.filter('get-current-version', function(){
 	//___________________________
     //___________________________
     //___________________________NEW VERSION goes here _________________
-    const CURRENT_VERSION = "1.2.17.1";
+    const CURRENT_VERSION = "1.2.18";
     //__________________________
     //___________________________
     //___________________________
@@ -769,7 +769,7 @@ Vue.filter('surveyChanged', function(type: string) {
         const stepNLP = store.state.Application.stPgNo.NLP;	
         const stepNLPR = store.state.Application.stPgNo.NLPR;
         const stepAFF = store.state.Application.stPgNo.AFF;
-        const stepEFSP = store.state.Application.stPgNo.EFSP;
+        // const stepEFSP = store.state.Application.stPgNo.EFSP;
 		
 		let step = stepPO._StepNo; 
 		let reviewPage = stepPO.ReviewYourAnswers; 
@@ -846,12 +846,13 @@ Vue.filter('surveyChanged', function(type: string) {
 		} else if(typeName == 'affidavit'){
 			step = stepAFF._StepNo; 
 			reviewPage = stepAFF.ReviewYourAnswersAFF; 
-			previewPages = [stepAFF.PreviewFormsAFF];
-		} else if(typeName == 'electronicFilingStatement'){
-			step = stepEFSP._StepNo; 
-			reviewPage = stepEFSP.ReviewYourAnswersEFSP; 
-			previewPages = [stepEFSP.PreviewFormsEFSP];
-		}
+			previewPages = [stepAFF.PreviewFormsAFF, stepAFF.PreviewFormsEFSP];
+		} 
+        // else if(typeName == 'electronicFilingStatement'){
+		// 	step = stepEFSP._StepNo; 
+		// 	reviewPage = stepEFSP.ReviewYourAnswersEFSP; 
+		// 	previewPages = [stepEFSP.PreviewFormsEFSP];
+		// }
 
 		return({step:step, reviewPage:reviewPage, previewPages:previewPages})
 	}
@@ -873,7 +874,7 @@ Vue.filter('surveyChanged', function(type: string) {
 		}
 	}
 	
-	const noPOstepsTypes = ['replyFlm','writtenResponse','familyLawMatter','priorityParenting','childReloc','caseMgmt','agreementEnfrc', 'other', 'noticeOfAddressChange', 'noticeDiscontinuance', 'noticeIntentionProceed', 'requestScheduling', 'trialReadinessStatement', 'noticeLawyerChild', 'noticeRemoveLawyerChild', 'noticeLawyerParty', 'noticeRemoveLawyerParty', 'affidavit', 'electronicFilingStatement']
+	const noPOstepsTypes = ['replyFlm','writtenResponse','familyLawMatter','priorityParenting','childReloc','caseMgmt','agreementEnfrc', 'other', 'noticeOfAddressChange', 'noticeDiscontinuance', 'noticeIntentionProceed', 'requestScheduling', 'trialReadinessStatement', 'noticeLawyerChild', 'noticeRemoveLawyerChild', 'noticeLawyerParty', 'noticeRemoveLawyerParty', 'affidavit']
 	
 	if(type == 'allExPO'){
         
@@ -897,7 +898,7 @@ Vue.filter('surveyChanged', function(type: string) {
         pathwayCompleted.noticeLawyerParty = false;	
         pathwayCompleted.noticeRemoveLawyerParty = false;
         pathwayCompleted.affidavit = false;
-        pathwayCompleted.electronicFilingStatement = false;
+        // pathwayCompleted.electronicFilingStatement = false;
 		store.commit("Application/setPathwayCompletedFull",pathwayCompleted);
 		store.commit("Application/setCommonStepResults",{data:{'pathwayCompleted':pathwayCompleted}});            
         store.dispatch("Application/checkAllCompleted")
diff --git a/web/src/store/modules/application.ts b/web/src/store/modules/application.ts
index facf7af3b..395ace84b 100644
--- a/web/src/store/modules/application.ts
+++ b/web/src/store/modules/application.ts
@@ -66,7 +66,7 @@ class Application extends VuexModule {
         noticeLawyerParty: false,
         noticeRemoveLawyerParty: false,
         affidavit: false,
-        electronicFilingStatement: false            
+        // electronicFilingStatement: false            
     }
 
     public stPgNo = {} as stepsAndPagesNumberInfoType;
@@ -2385,74 +2385,90 @@ class Application extends VuexModule {
         p.progress = 0;    
         s.pages.push(p);
 
-        //____________Review
         p = {} as pageInfoType;
         p.key = "4";
-        p.name = "ReviewYourAnswersAFF";
-        p.label = "Review Your Answers";
-        p.active = true;
-        p.progress = 0;    
-        s.pages.push(p);
-
-        p = {} as pageInfoType;
-        p.key = "5";
-        p.name = "PreviewFormsAFF";
-        p.label = "Preview Forms";
+        p.name = "ElectronicFilingStatementAFF";
+        p.label = "Electronic Filing Statement";
         p.active = false;
         p.progress = 0;    
         s.pages.push(p);
 
-        this.steps.push(s);
-
-        // Affidavit STOP
-
-        // Electronic Filing Statement START
-
-        s = {} as stepInfoType;    
-        s.active = false;
-        s.id = "23";
-        s.name = "EFSP";
-        s.label = "Electronic Filing Statement";
-        s.icon = "fa fa-file";
-        s.lastUpdate = null;
-        s.type = "electronicFilingStatement";
-        s.pages = new Array<pageInfoType>();
-        s.currentPage = 0;        
-
+        //____________Review
         p = {} as pageInfoType;
-        p.key = "0";
-        p.name = "ElectronicFilingStatement";
-        p.label = "Electronic Filing Statement";
+        p.key = "5";
+        p.name = "ReviewYourAnswersAFF";
+        p.label = "Review Your Answers";
         p.active = true;
         p.progress = 0;    
-        s.pages.push(p);        
+        s.pages.push(p);
 
-        //____________Review
         p = {} as pageInfoType;
-        p.key = "1";
-        p.name = "ReviewYourAnswersEFSP";
-        p.label = "Review Your Answers";
-        p.active = true;
+        p.key = "6";
+        p.name = "PreviewFormsAFF";
+        p.label = "Preview Form 45";
+        p.active = false;
         p.progress = 0;    
         s.pages.push(p);
 
         p = {} as pageInfoType;
-        p.key = "2";
+        p.key = "7";
         p.name = "PreviewFormsEFSP";
-        p.label = "Preview Forms";
+        p.label = "Preview Form 51";
         p.active = false;
         p.progress = 0;    
         s.pages.push(p);
 
         this.steps.push(s);
 
-        // Electronic Filing Statement STOP
+        // Affidavit STOP
+
+        // // Electronic Filing Statement START
+
+        // s = {} as stepInfoType;    
+        // s.active = false;
+        // s.id = "23";
+        // s.name = "EFSP";
+        // s.label = "Electronic Filing Statement";
+        // s.icon = "fa fa-file";
+        // s.lastUpdate = null;
+        // s.type = "electronicFilingStatement";
+        // s.pages = new Array<pageInfoType>();
+        // s.currentPage = 0;        
+
+        // p = {} as pageInfoType;
+        // p.key = "0";
+        // p.name = "ElectronicFilingStatement";
+        // p.label = "Electronic Filing Statement";
+        // p.active = true;
+        // p.progress = 0;    
+        // s.pages.push(p);        
+
+        // //____________Review
+        // p = {} as pageInfoType;
+        // p.key = "1";
+        // p.name = "ReviewYourAnswersEFSP";
+        // p.label = "Review Your Answers";
+        // p.active = true;
+        // p.progress = 0;    
+        // s.pages.push(p);
+
+        // p = {} as pageInfoType;
+        // p.key = "2";
+        // p.name = "PreviewFormsEFSP";
+        // p.label = "Preview Forms";
+        // p.active = false;
+        // p.progress = 0;    
+        // s.pages.push(p);
+
+        // this.steps.push(s);
+
+        // // Electronic Filing Statement STOP
 
 
         //Submit START
         s = {} as stepInfoType;
         s.active = false;        
-        s.id = "24";
+        s.id = "23";
         s.name = "SUBMIT";
         s.label = "Review and File";
         s.icon = "fa fa-paper-plane";
@@ -2968,7 +2984,7 @@ class Application extends VuexModule {
     }
     @Action
     public UpdateStPgNo(newStPgNo) {
-        const stepsAndPagesNumber = {GETSTART: {}, PO: {}, COMMON: {}, RFLM:{}, WR:{}, CA:{}, FLM: {}, CM: {}, PPM: {}, RELOC: {}, ENFRC: {}, CONNECT:{}, OTHER:{}, NCD:{}, NDT:{}, NPR: {}, RQS: {}, TRIS: {}, NLC: {}, NLCR: {}, NLP:{}, NLPR: {}, AFF: {}, EFSP: {}, SUBMIT: {}} as stepsAndPagesNumberInfoType
+        const stepsAndPagesNumber = {GETSTART: {}, PO: {}, COMMON: {}, RFLM:{}, WR:{}, CA:{}, FLM: {}, CM: {}, PPM: {}, RELOC: {}, ENFRC: {}, CONNECT:{}, OTHER:{}, NCD:{}, NDT:{}, NPR: {}, RQS: {}, TRIS: {}, NLC: {}, NLCR: {}, NLP:{}, NLPR: {}, AFF: {}, SUBMIT: {}} as stepsAndPagesNumberInfoType
          const steps = this.steps
         for(const step of steps){
             stepsAndPagesNumber[step.name]._StepNo = Number(step.id)           
diff --git a/web/src/types/Application/Affidavit/index.ts b/web/src/types/Application/Affidavit/index.ts
index 8a9c46103..90bd56bdf 100644
--- a/web/src/types/Application/Affidavit/index.ts
+++ b/web/src/types/Application/Affidavit/index.ts
@@ -56,4 +56,24 @@ export interface filingAffDataInfoType {
 export interface storyDataInfoType {
     index?: number;
     content?: string;
+}
+
+export interface electronicFilingStatementDataInfoType {
+    Lawyer?: string;
+    ApplicantName?: nameInfoType;
+    PartyInfoEfsp?: efspPartyInfoType[];
+    OtherPartyInfoEfsp?: efspPartyInfoType[];
+    StatementConfirmation?: string[];
+}
+
+export interface efspPartyInfoType {
+    name: nameInfoType;
+}
+  
+export interface electronicFilingStatementAffSurveyInfoType {
+    data: electronicFilingStatementDataInfoType;
+    questions?: questionInfoType[];
+    pageName?: string;
+    currentStep?: number | string;
+    currentPage?: number | string;
 }
\ No newline at end of file
diff --git a/web/src/types/Application/ElectronicFilingStatement/index.ts b/web/src/types/Application/ElectronicFilingStatement/index.ts
index 814aaf185..24e1ba083 100644
--- a/web/src/types/Application/ElectronicFilingStatement/index.ts
+++ b/web/src/types/Application/ElectronicFilingStatement/index.ts
@@ -1,21 +1,21 @@
 import { nameInfoType, questionInfoType } from "../CommonInformation";
 
-export interface electronicFilingStatementDataInfoType {
-    Lawyer?: string;
-    ApplicantName?: nameInfoType;
-    PartyInfoEfsp?: efspPartyInfoType[];
-    OtherPartyInfoEfsp?: efspPartyInfoType[];
-    StatementConfirmation?: string[];
-}
+// export interface electronicFilingStatementDataInfoType {
+//     Lawyer?: string;
+//     ApplicantName?: nameInfoType;
+//     PartyInfoEfsp?: efspPartyInfoType[];
+//     OtherPartyInfoEfsp?: efspPartyInfoType[];
+//     StatementConfirmation?: string[];
+// }
 
-export interface efspPartyInfoType {
-    name: nameInfoType;
-}
+// export interface efspPartyInfoType {
+//     name: nameInfoType;
+// }
   
-export interface electronicFilingStatementSurveyInfoType {
-    data: electronicFilingStatementDataInfoType;
-    questions?: questionInfoType[];
-    pageName?: string;
-    currentStep?: number | string;
-    currentPage?: number | string;
-}
\ No newline at end of file
+// export interface electronicFilingStatementSurveyInfoType {
+//     data: electronicFilingStatementDataInfoType;
+//     questions?: questionInfoType[];
+//     pageName?: string;
+//     currentStep?: number | string;
+//     currentPage?: number | string;
+// }
\ No newline at end of file
diff --git a/web/src/types/Application/StepsAndPages/index.ts b/web/src/types/Application/StepsAndPages/index.ts
index 709a761d3..aeb276a98 100644
--- a/web/src/types/Application/StepsAndPages/index.ts
+++ b/web/src/types/Application/StepsAndPages/index.ts
@@ -29,7 +29,7 @@ export interface stepsAndPagesNumberInfoType{
     NLP: NLPstPgTypes;
     NLPR: NLPRstPgTypes;
     AFF: AFFstPgTypes;
-    EFSP: EFSPstPgTypes;
+    // EFSP: EFSPstPgTypes;
     SUBMIT: SUBMITstPgTypes;
 }
  
@@ -367,8 +367,10 @@ export interface AFFstPgTypes{
     AboutAffiant: number;
     YourStoryAFF: number;
     FilingAFF: number;
+    ElectronicFilingStatementAFF: number;
     ReviewYourAnswersAFF: number;
     PreviewFormsAFF: number;
+    PreviewFormsEFSP: number;
 }
 
 export interface NLPstPgTypes{
@@ -387,13 +389,13 @@ export interface NLPRstPgTypes{
     PreviewFormsNLPR: number;
 }
 
-export interface EFSPstPgTypes{
-    _StepNo: number;
+// export interface EFSPstPgTypes{
+//     _StepNo: number;
 
-    ElectronicFilingStatement: number;    
-    ReviewYourAnswersEFSP: number;
-    PreviewFormsEFSP: number;
-}
+//     ElectronicFilingStatement: number;    
+//     ReviewYourAnswersEFSP: number;
+//     PreviewFormsEFSP: number;
+// }
 
 export interface SUBMITstPgTypes{
     _StepNo: number;
diff --git a/web/src/types/Application/index.ts b/web/src/types/Application/index.ts
index e1b6a3021..1341ee6a8 100644
--- a/web/src/types/Application/index.ts
+++ b/web/src/types/Application/index.ts
@@ -28,8 +28,8 @@ import { noticeLawyerChildSurveyInfoType, otherPartyNLCConfirmationSurveyInfoTyp
 import { noticeRemoveLawyerChildSurveyInfoType, otherPartyNLCRConfirmationSurveyInfoType } from "./NoticeRemoveLawyerChild";
 import { noticeLawyerPartySurveyInfoType, otherPartyNLPConfirmationSurveyInfoType } from "./LawyerParty";
 import { noticeRemoveLawyerPartySurveyInfoType, otherPartyNLPRConfirmationSurveyInfoType } from "./NoticeRemoveLawyerParty";
-import { aboutAffiantSurveyInfoType, affidavitSurveyInfoType, filingAffSurveyInfoType, yourStoryAffSurveyInfoType } from "./Affidavit";
-import { electronicFilingStatementSurveyInfoType } from "./ElectronicFilingStatement";
+import { aboutAffiantSurveyInfoType, affidavitSurveyInfoType, filingAffSurveyInfoType, yourStoryAffSurveyInfoType, electronicFilingStatementAffSurveyInfoType} from "./Affidavit";
+// import { electronicFilingStatementSurveyInfoType } from "./ElectronicFilingStatement";
 
 
 //This is what our database saves.
@@ -106,7 +106,7 @@ export interface stepInfoType {
     protectedPartyName?: nameInfoType;    
     protectedChildName?: allchildrenInfoType[];
     supportingDocumentForm4?: number[];
-    efsDocuments?: electronicFilingDocumentInfoType[];
+    affEfsDocuments?: electronicFilingDocumentInfoType[];
 
     //______Step 1 PO____
     aboutSurvey?: aboutPOSurveyInfoType;
@@ -331,9 +331,10 @@ export interface stepInfoType {
     aboutAffiantSurvey?: aboutAffiantSurveyInfoType;
     yourStoryAffSurvey?: yourStoryAffSurveyInfoType;
     filingAffSurvey?: filingAffSurveyInfoType;
+    electronicFilingStatementAffSurvey?: electronicFilingStatementAffSurveyInfoType;
 
     //_____Step 21 ELECTRONIC FILING STATEMENT_____________    
-    electronicFilingStatementSurvey?: electronicFilingStatementSurveyInfoType;
+    // electronicFilingStatementSurvey?: electronicFilingStatementSurveyInfoType;
     
     //__Step 22 SUBMIT
     filingOptionsSurvey?: filingOptionsSurveyInfoType;
@@ -360,7 +361,7 @@ export interface stepInfoType {
     noticeLawyerParty?: boolean;
     noticeRemoveLawyerParty?: boolean; 
     affidavit?: boolean;
-    electronicFilingStatement?: boolean;
+    // electronicFilingStatement?: boolean;
   }
 
   export interface electronicFilingDocumentInfoType {