diff --git a/backend/src/components/application.js b/backend/src/components/application.js
index 2e1f1408..4d6869a7 100644
--- a/backend/src/components/application.js
+++ b/backend/src/components/application.js
@@ -321,7 +321,7 @@ async function postClosureDates(dates, ccfriApplicationGuid, res) {
 
 async function getECEWEApplication(req, res) {
   try {
-    let operation = 'ccof_applications(' + req.params.applicationId + ')?$select=ccof_ecewe_optin,ccof_ecewe_employeeunion,ccof_ecewe_selecttheapplicablefundingmodel,ccof_ecewe_selecttheapplicablesector,ccof_ecewe_confirmation&$expand=ccof_ccof_application_ccof_applicationecewe_application($select=ccof_name,_ccof_facility_value,ccof_optintoecewe,statuscode)';
+    let operation = 'ccof_applications(' + req.params.applicationId + ')?$select=ccof_ecewe_optin,ccof_ecewe_employeeunion,ccof_ecewe_selecttheapplicablefundingmodel,ccof_ecewe_selecttheapplicablesector,ccof_public_sector_employer,ccof_ecewe_confirmation&$expand=ccof_ccof_application_ccof_applicationecewe_application($select=ccof_name,_ccof_facility_value,ccof_optintoecewe,statuscode)';
     let eceweApp = await getOperation(operation);
     eceweApp = new MappableObjectForFront(eceweApp, ECEWEApplicationMappings);
     let forFrontFacilities = [];
diff --git a/backend/src/components/user.js b/backend/src/components/user.js
index eddf018a..acbb531d 100644
--- a/backend/src/components/user.js
+++ b/backend/src/components/user.js
@@ -183,6 +183,7 @@ function updateFacilityWithChangeRequestDetails(changeRequestList, returnValue,
 
 function parseFacilityData(application, facilities) {
 
+  //all the facilites
   let facilityMap  = new Map(facilities?.map((m) => [m['accountid'], new MappableObjectForFront(m, UserProfileFacilityMappings).data]));
 
   if (application) {
@@ -206,7 +207,10 @@ function parseFacilityData(application, facilities) {
   }
   let facilityList = [];
   facilityMap.forEach((facility) => {
-    if (!_.isEmpty(facility)) {
+    // //only add a facility to the application Facility List if they have an application id shown below.
+    // //otherwise that facility does not exist in this application year.
+    //if application status is incomplete, show all available facilties so CR fac's will also appear for the draft application
+    if (facility.ccofBaseFundingId || facility.ccfriApplicationId || facility.eceweApplicationId || application.statuscode_formatted == 'Incomplete') {
       facility.ccofBaseFundingStatus = getLabelFromValue(facility.ccofBaseFundingStatus, CCOF_STATUS_CODES);
       facility.ccfriStatus = getLabelFromValue(facility.ccfriStatus, CCFRI_STATUS_CODES, 'NOT STARTED');
       facility.eceweStatus = getLabelFromValue(facility.eceweStatus, ECEWE_STATUS_CODES, 'NOT STARTED');
diff --git a/backend/src/util/mapping/Mappings.js b/backend/src/util/mapping/Mappings.js
index c8799e87..c13fcbc0 100644
--- a/backend/src/util/mapping/Mappings.js
+++ b/backend/src/util/mapping/Mappings.js
@@ -242,6 +242,7 @@ const ECEWEApplicationMappings = [
   { back: 'ccof_licensecomplete', front: 'isLicenseUploadComplete' },
   { back: 'ccof_ecewe_eligibility_complete', front: 'isEceweComplete' },
   { back: 'ccof_ecewe_selecttheapplicablesector', front: 'applicableSector' },
+  { back: 'ccof_public_sector_employer', front: 'publicSector' }, //null,
 ];
 
 const ECEWEFacilityMappings = [
@@ -342,6 +343,7 @@ const ProgramYearMappings = [
   { back: 'ccof_intakeperiodstart', front: 'intakeStart' },
   { back: 'ccof_intakeperiodend', front: 'intakeEnd' },
   { back: 'ccof_declarationbstart', front: 'declarationbStart' },
+  { back: 'ccof_ccfri_funding_guidelines', front: 'fundingGuidelinesUrl' },
 ];
 
 const MessageMappings = [
@@ -399,6 +401,7 @@ const ApplicationSummaryMappings = [
   { back: 'ccof_ecewe_confirmation', front: 'confirmation' }, //null,
   { back: 'ccof_ecewe_employeeunion', front: 'belongsToUnion' }, //0,
   { back: 'ccof_ecewe_selecttheapplicablefundingmodel', front: 'fundingModel' }, //null,
+  { back: 'ccof_public_sector_employer', front: 'publicSector' }, //null,
   // Unlock Details
   { back: 'ccof_unlock_ccof', front: 'unlockBaseFunding' }, //null,
   { back: 'ccof_unlock_ecewe', front: 'unlockEcewe' }, //null,
diff --git a/frontend/src/components/LandingPage.vue b/frontend/src/components/LandingPage.vue
index ca64bda9..0cda01a4 100644
--- a/frontend/src/components/LandingPage.vue
+++ b/frontend/src/components/LandingPage.vue
@@ -99,8 +99,8 @@
             </v-row>
             <v-row>
               <v-col cols="12" style="text-align: center;">
-                <p>By clicking continue, all of your application data will be deleted. You will have to re-enter all information. Please be sure about this!</p>
-                <p class="pt-4">Are you very very sure??</p>
+                <p>If you cancel your application, any information you entered will be deleted. If you create a new application, you will need to re-enter this information.</p>
+                <p class="pt-4">Are you sure you want to cancel your application and delete your information?</p>
                 <v-btn :loading="!isLoadingComplete" dark color="secondary" class="mr-10" @click="closeDialog()">Back</v-btn>
                 <v-btn :loading="!isLoadingComplete" dark color="primary" @click="deletePcf()">Continue</v-btn>
               </v-col>
diff --git a/frontend/src/components/RFI/NMF.vue b/frontend/src/components/RFI/NMF.vue
index 290506b9..3a9efd6f 100644
--- a/frontend/src/components/RFI/NMF.vue
+++ b/frontend/src/components/RFI/NMF.vue
@@ -11,7 +11,7 @@
 
       <div class="px-2 my-10">
         <p>
-          As outlined in the <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E" target="_blank">Funding Guidelines</a>
+          As outlined in the <a :href="fundingUrl"  target="_blank">Funding Guidelines</a>
           , applications by New, New-to-CCFRI, and Modified Facilities
           will be assessed based on whether the facility’s parent fees are comparable to others in their region.
           To determine if this policy applies to your facility, please provide more information.
@@ -141,7 +141,7 @@
           <div class="px-md-12 px-7 pb-10">
             <p class="text-h6 text--primary my-0">
               4. Please tell us anything else you’d like us to know about how your facility’s business case
-              supports setting fees higher than the Affordability Benchmarks outlined in the 2023/24 <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E" target="_blank">Funding Guidelines</a>.
+              supports setting fees higher than the Affordability Benchmarks outlined in the 2023/24 <a :href="fundingUrl"  target="_blank">Funding Guidelines</a>
             </p>
             <div class="pt-6">
               <v-textarea
@@ -193,12 +193,16 @@ export default {
     ...mapState('application', ['formattedProgramYear']),
     ...mapState('nmfApp', ['nmfModel']),
     ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId']),
+    ...mapGetters('app', [ 'getFundingUrl']),
     currentFacility(){
       return this.getNavByCCFRIId(this.$route.params.urlGuid);
     },
     isReadOnly(){
       return (!this.currentFacility.unlockNmf);
     },
+    fundingUrl(){
+      return this.getFundingUrl(this.programYearId);
+    },
   },
   watch: {
     '$route.params.urlGuid': {
diff --git a/frontend/src/components/RFI/RFILanding.vue b/frontend/src/components/RFI/RFILanding.vue
index 9ea5e6d5..76e6384e 100644
--- a/frontend/src/components/RFI/RFILanding.vue
+++ b/frontend/src/components/RFI/RFILanding.vue
@@ -26,8 +26,7 @@
         <p>
           You have entered a parent fee above the 2023/24 fee increase limit.
           Fee increases over the limit will be assessed under the Parent Fee Increase Exceptions policy.
-          See the <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E" target="_blank">CCFRI
-          Funding Guidelines</a> for more information.
+          See the <a :href="fundingUrl"  target="_blank">Funding Guidelines</a> for more information.
         </p>
         <p>
           Complete this section to provide more information about your fee increase, or click “Back” to return to the
@@ -49,8 +48,7 @@
           </div>
           <br>
           <p class="text-h6 text--primary px-md-10 px-7 py-0 my-0">
-            As outlined in the <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E"
-                                  target="_blank">Funding Guidelines</a>, this exception applies to sudden and
+            As outlined in the <a :href="fundingUrl"  target="_blank">Funding Guidelines</a>, this exception applies to sudden and
             unexpected expenses that:
           </p>
           <div class="px-md-14 px-7 text--primary">
@@ -127,8 +125,7 @@
                 class="mr-5"
               > mdi-information
               </v-icon>
-              <strong>Note: See the <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E"
-                                       target="_blank">Funding Guidelines</a> for the list of eligible expenses</strong>
+              <strong>Note: See the <a :href="fundingUrl"  target="_blank">Funding Guidelines</a> for the list of eligible expenses</strong>
             </v-banner>
             <div class="px-md-12 px-7">
 
@@ -474,27 +471,27 @@
             </v-radio-group>
 
             <div v-if="model.feeIncreaseDueToWage == 1">
-              <br>
-
-              <v-radio-group
-                class="radio-label"
-                :disabled="isReadOnly"
-                :rules="rules.required"
-                required
-                row
-                v-model="model.increaseInWriting"
-                label="Was the wage increase committed to (in writing) before the January 2022 release of the Funding Guidelines?"
-              >
-                <v-radio
-                  label="Yes"
-                  :value="1"
-                ></v-radio>
-                <v-radio
-                  label="No"
-                  :value="0"
-                ></v-radio>
-              </v-radio-group>
-
+              <div v-if="languageYearLabel == programYearTypes.HISTORICAL">
+                <br>
+                <v-radio-group
+                  class="radio-label"
+                  :disabled="isReadOnly"
+                  :rules="rules.required"
+                  required
+                  row
+                  v-model="model.increaseInWriting"
+                  label="Was the wage increase committed to (in writing) before the January 2022 release of the Funding Guidelines?"
+                >
+                  <v-radio
+                    label="Yes"
+                    :value="1"
+                  ></v-radio>
+                  <v-radio
+                    label="No"
+                    :value="0"
+                  ></v-radio>
+                </v-radio-group>
+              </div>
               <br>
 
               <v-radio-group
@@ -1503,6 +1500,7 @@ import {isEqual} from 'lodash';
 import rules from '@/utils/rules';
 import RFIDocumentUpload from '@/components/RFI/RFIDocumentUpload';
 import NavButton from '@/components/util/NavButton';
+import {PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants';
 
 let model = {
   expansionList: [],
@@ -1598,14 +1596,24 @@ export default {
   computed: {
     ...mapState('rfiApp', ['rfiModel', 'loadedModel']),
     ...mapState('app', ['programYearList']),
-    ...mapState('application', ['formattedProgramYear', 'applicationStatus', 'applicationId']),
+    ...mapState('application', ['formattedProgramYear', 'applicationStatus', 'applicationId', 'programYearId']),
     ...mapState('navBar',['changeRequestId']),
     ...mapGetters('supportingDocumentUpload', ['getUploadedDocuments']),
     ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId','isChangeRequest']),
     ...mapGetters('reportChanges',['changeRequestStatus']),
+    ...mapGetters('app', [ 'getFundingUrl', 'getLanguageYearLabel']),
     currentFacility() {
       return this.getNavByCCFRIId(this.$route.params.urlGuid);
     },
+    fundingUrl(){
+      return this.getFundingUrl(this.programYearId);
+    },
+    languageYearLabel(){
+      return this.getLanguageYearLabel;
+    },
+    programYearTypes(){
+      return PROGRAM_YEAR_LANGUAGE_TYPES;
+    },
     isReadOnly() {
       //if submitted, lock er up. If unlock CCFRI - unlock
       if (this.currentFacility?.unlockRfi) {
diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
index bf4da1c0..2b9c194d 100644
--- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue
+++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -206,7 +206,8 @@
           <div class="px-md-12 px-7">
             <br>
             <div>
-              <p> Do you charge parent fees at this facility for any closures on business days (other than designated holidays)? Only indicate the date of closures where parent fees are charged. </p>
+              <p v-if="languageYearLabel == programYearTypes.HISTORICAL"> Do you charge parent fees at this facility for any closures on business days (other than designated holidays)? Only indicate the date of closures where parent fees are charged. </p>
+              <p v-else> Do you charge parent fees at this facility for any closures on business days (other than provincial statutory holidays)? Only indicate the date of closures where parent fees are charged. </p>
             </div>
             <v-radio-group
               required
@@ -429,7 +430,7 @@
                 <p class="pt-4">You have entered a parent fee above the {{formattedProgramYear}} parent fee increase limit for the following care categories:<br><br>
                   <span v-for="item in rfi3percentCategories" :key="item">{{item}}<br></span>
                 </p>
-                <p>Parent fee increases over the limit will be assessed under the Parent Fee Increase Exceptions policy in the {{formattedProgramYear}} <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E" target="_blank">Funding Guidelines</a>. You can continue to the Request for Information section or press back to update your fees.</p>
+                <p>Parent fee increases over the limit will be assessed under the Parent Fee Increase Exceptions policy in the {{formattedProgramYear}} <a :href="fundingUrl"  target="_blank">Funding Guidelines</a>. You can continue to the Request for Information section or press back to update your fees.</p>
                 <p class="pt-4">Please confirm you have provided your highest full-time (i.e. over 4 hours, 5 days a week) parent fee for each care category before CCFRI is applied. Submit your daily parent fee if you only offer care for 4 days or fewer per week.</p>
                 <v-btn dark color="secondary" class="mr-10" @click="closeDialog()">Back</v-btn>
                 <v-btn dark color="primary" @click="toRfi()">Continue</v-btn>
@@ -442,7 +443,7 @@
   </v-form>
 </template>
 <script>
-import { PATHS, pcfUrlGuid, pcfUrl, changeUrl, changeUrlGuid, CHANGE_TYPES } from '@/utils/constants';
+import { PATHS, pcfUrlGuid, pcfUrl, changeUrl, changeUrlGuid, CHANGE_TYPES, PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants';
 import { mapGetters, mapState, mapActions, mapMutations} from 'vuex';
 import alertMixin from '@/mixins/alertMixin';
 import globalMixin from '@/mixins/globalMixin';
@@ -513,7 +514,7 @@ export default {
     next();
   },
   computed: {
-    ...mapGetters('app', ['lookupInfo']),
+    ...mapGetters('app', [ 'getFundingUrl', 'getLanguageYearLabel']),
     ...mapState('application', ['applicationStatus', 'formattedProgramYear', 'programYearId', 'applicationId', 'isRenewal']),
     ...mapState('navBar', ['navBarList','changeRequestId', 'changeType']),
     ...mapState('ccfriApp', ['CCFRIFacilityModel', 'ccfriChildCareTypes', 'loadedModel', 'ccfriId']),
@@ -521,10 +522,18 @@ export default {
     ...mapGetters('navBar', ['nextPath', 'previousPath', 'getNavByCCFRIId','isChangeRequest', 'getChangeActionNewFacByFacilityId']),
     ...mapState('reportChanges',['userProfileChangeRequests']),
     ...mapGetters('reportChanges',['changeRequestStatus']),
-
+    languageYearLabel(){
+      return this.getLanguageYearLabel;
+    },
+    programYearTypes(){
+      return PROGRAM_YEAR_LANGUAGE_TYPES;
+    },
     currentFacility(){
       return this.getNavByCCFRIId(this.$route.params.urlGuid);
     },
+    fundingUrl(){
+      return this.getFundingUrl(this.programYearId);
+    },
     isReadOnly(){
       //if submitted, lock er up. If unlock CCFRI - unlock
       if (this.currentFacility.unlockCcfri){
diff --git a/frontend/src/components/ccfriApplication/group/RequestForInfo.vue b/frontend/src/components/ccfriApplication/group/RequestForInfo.vue
deleted file mode 100644
index 90800f9b..00000000
--- a/frontend/src/components/ccfriApplication/group/RequestForInfo.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <v-container>
-
-    <LargeCard
-      title="Exceptional Circumstances"
-      subtitle="As outlined in the Funding Guidelines, exceptional circumstances are expenses that are:"
-    >
-      <ul>
-        <li>
-          Sudden, unexpected, or oustide of the Organization's control; and
-        </li>
-        <li>
-          Must also address an immediate health/safety concern, or is necessary for the facility to remain operational
-        </li>
-      </ul>
-      <br>
-      <p>Is your fee increase due to an exceptional circumstance?</p>
-      <v-radio-group
-        required
-        row
-        v-model="model.q1"
-        label=""
-      >
-        <v-radio
-          label="Yes"
-          value="Yes"
-        ></v-radio>
-        <v-radio
-          label="No"
-          value="No"
-        ></v-radio>
-      </v-radio-group>
-    </LargeCard>
-
-    <LargeCard
-      title="Direct Care Staff Wages Increases"
-      subtitle="Note: if your facility has ECE employees eligible for ECE Wage Enhancement (ECE-WE), you are required to apply for ECE-WE prior to being approved for a fee increase."
-    >
-      <p>
-        As defined in the Funding Guidelines, Direct Care Staff are staff employed on either a full-time, part-time, or casual basis, provinding direct care to children at the facility for 50% or more of their working time
-      </p>
-      <p>Is your fee increase due to a wage increase for Direct Care Staff?</p>
-      <v-radio-group
-        required
-        row
-        v-model="model.q2"
-        label=""
-      >
-        <v-radio
-          label="Yes"
-          value="Yes"
-        ></v-radio>
-        <v-radio
-          label="No"
-          value="No"
-        ></v-radio>
-      </v-radio-group>
-    </LargeCard>
-
-    <LargeCard
-      title="Priority Service Expansion: Increase in hours of Operation"
-    >
-      <p>Is your fee increase due to an increase in hours/days of operation in order to provide care during expanded, extended, and/or non-traditional hours?</p>
-      <v-radio-group
-        required
-        row
-        v-model="model.q3"
-        label=""
-      >
-        <v-radio
-          label="Yes"
-          value="Yes"
-        ></v-radio>
-        <v-radio
-          label="No"
-          value="No"
-        ></v-radio>
-      </v-radio-group>
-    </LargeCard>
-
-    <LargeCard
-      title="Priority Service Expansion: Increased Connection to Indigenous Community, Culture, and/or Language"
-    >
-      <p>Is your fee increase due to an increased connection to Indigenous community, culture, or language in an Indigenous Facility or Organization?</p>
-
-      <p>As outlined in the Funding Guidelines, this may inclide expenses associated with, but not limited to:</p>
-      <ul>
-        <li>
-          Participation of an Elder, culture/language, and/or family in the child care program;
-        </li>
-        <li>
-          Participation of children in community, language, and/or cultural events or activities; or
-        </li>
-        <li>
-          Language or culture resources for use in child care program.
-        </li>
-      </ul>
-      <v-radio-group
-        required
-        row
-        v-model="model.q4"
-        label=""
-      >
-        <v-radio
-          label="Yes"
-          value="Yes"
-        ></v-radio>
-        <v-radio
-          label="No"
-          value="No"
-        ></v-radio>
-      </v-radio-group>
-    </LargeCard>
-
-    <LargeCard
-      title="Affordable Child Care for Underserved Populations"
-      subtitle="To be considered under this policy, the Facility must meet all of the following criteria as outlined in the Funding Guidelines:"
-    >
-
-      <ul>
-        <li>
-          Has historcally provided care to underserved populations-including Indigenous or low-income populations-at significantely below the regional median range of fees for their area or at no fee;
-        </li>
-        <li>
-          Can demonstrate Parent Fee Increases will contribute to the operational sustainability of the organization; and
-        </li>
-        <li>
-          Can demonstrate Parent Fee Increase will not substantively increase the actual cost of care for parents/families?
-        </li>
-      </ul>
-      <br>
-      <p>Does this Facility meet all the above criteria?</p>
-      <v-radio-group
-        required
-        row
-        v-model="model.q5"
-        label=""
-      >
-        <v-radio
-          label="Yes"
-          value="Yes"
-        ></v-radio>
-        <v-radio
-          label="No"
-          value="No"
-        ></v-radio>
-      </v-radio-group>
-    </LargeCard>
-
-    <LargeCard>
-      TODO: document upload goes here!
-    </LargeCard>
-
-    <NavButton :isNextDisplayed="true" :isSaveDisplayed="true"
-        :isSaveDisabled="false" :isNextDisabled="false" :isProcessing="processing"
-        @previous="previous" @next="next" @validateForm="validateForm()"></NavButton>
-
-  </v-container>
-</template>
-
-<script>
-import LargeCard from '../../guiComponents/LargeCard.vue';
-import NavButton from '@/components/util/NavButton';
-import {mapState, mapGetters} from 'vuex';
-
-
-let model = { x: [] };
-
-export default {
-  name: 'CcfriRequestMoreInfo',
-  data() {
-    return {
-      model,
-      input : '',
-      q1 : '',
-      q2: '',
-      q3: '',
-      q4: '',
-      q5 : '',
-
-    };
-  },
-  mounted() {
-    this.model = this.$store.state.ccfriApp.model ?? model;
-    //this.ccfriOptInOrOut = this.$store.ccfriOptInOrOut.ccfriApp.ccfriOptInOrOut ?? ccfriOptInOrOut;
-  },
-  beforeRouteLeave(_to, _from, next) {
-    this.$store.commit('ccfriApp/model', this.model);
-    //this.$store.commit('ccfriApp/ccfriOptInOrOut', this.ccfriOptInOrOut);
-    next();
-  },
-  computed: {
-    ...mapState('application', ['programYearId']),
-    ...mapGetters('navBar', ['previousPath']),
-  },
-  methods : {
-    previous() {
-      this.$router.push(this.previousPath);
-    },
-  },
-  components: { LargeCard, NavButton }
-};
-
-
-</script>
-
diff --git a/frontend/src/components/eceweApplication/EceweEligibility.vue b/frontend/src/components/eceweApplication/EceweEligibility.vue
index a11e8754..6d716870 100644
--- a/frontend/src/components/eceweApplication/EceweEligibility.vue
+++ b/frontend/src/components/eceweApplication/EceweEligibility.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-form ref="form">
+  <v-form ref="isValidForm" v-model="isValidForm">
 
     <v-container>
       <div class="row pt-4 justify-center">
@@ -27,7 +27,7 @@
             </v-icon>
           </span>
           <span>
-            <strong>Note:</strong> Please read and understand the full eligibility requirements in the <u>ECE-WE Funding Guidelines</u>.  All CCFRI-eligible facilities must opt-in to CCFRI <u>to be eligible for ECE-WE.</u>
+            <strong>Note:</strong> Please read and understand the full eligibility requirements in the <u><a href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/running-daycare-preschool/child-care-operating-funding/wage-enhancement"  target="_blank"> ECE-WE Funding Guidelines</a></u>.  All CCFRI-eligible facilities must opt-in to CCFRI <u>to be eligible for ECE-WE.</u>
           </span>
         </v-alert>
       </v-row>
@@ -104,7 +104,47 @@
           </v-container>
         </v-card>
       </v-row>
+
+      <div v-if="languageYearLabel != programYearTypes.HISTORICAL">
       <v-row v-if="(model.belongsToUnion == 1 && model.optInECEWE == 1) || isLoading" class="justify-center">
+        <v-card elevation="4" class="py-2 px-5 mx-2 mt-10 rounded-lg col-11">
+          <v-container>
+            <v-row v-if="isLoading">
+              <v-col>
+                <v-skeleton-loader v-if="isLoading" :loading="isLoading" type="text@1"></v-skeleton-loader>
+                <v-skeleton-loader v-if="isLoading" :loading="isLoading" type="actions"></v-skeleton-loader>
+              </v-col>
+            </v-row>
+            <v-row v-if="!isLoading" class="justify-left">
+              <v-col align-self="start">
+                <v-radio-group
+                  v-model="model.publicSector"
+                  :disabled="isReadOnly()"
+                  :rules="rules.required">
+                  <template v-slot:label>
+                    <div class="radio-label text-left">Are you a public sector employer, as defined in the <u><i>Public Sector Employers Act?</i></u></div>
+                  </template>
+                  <div class="flex-left">
+                  <v-radio class="pt-2 pr-8"
+                    label="Yes"
+                    :value="1"
+                ></v-radio>
+                <v-radio
+                    class="pt-1"
+                    label="No"
+                    :value="0"
+                    @click="model.applicableSector=null"
+                  ></v-radio>
+                </div>
+                </v-radio-group>
+              </v-col>
+            </v-row>
+          </v-container>
+        </v-card>
+      </v-row>
+    </div>
+
+      <v-row v-if="(model.belongsToUnion == 1 && model.optInECEWE == 1 && model.publicSector == 1 && languageYearLabel != programYearTypes.HISTORICAL) || (model.belongsToUnion == 1 && model.optInECEWE == 1 && languageYearLabel == programYearTypes.HISTORICAL) || isLoading" class="justify-center">
         <v-card elevation="4" class="py-2 px-5 mx-2 mt-10 rounded-lg col-11">
           <v-container>
             <v-row v-if="isLoading">
@@ -120,7 +160,7 @@
                   :disabled="isReadOnly()"
                   :rules="rules.required">
                   <template v-slot:label>
-                    <div class="radio-label text-left">Select the sector:</div>
+                    <div class="radio-label text-left">Select the applicable sector:</div>
                   </template>
                   <div class="flex-left">
                   <v-radio class="pt-2 pr-8"
@@ -139,7 +179,7 @@
               </v-col>
             </v-row>
           </v-container>
-          <v-card v-if="(model.applicableSector == 100000001 && model.belongsToUnion == 1 && model.optInECEWE == 1) || isLoading" class="mx-2 mb-4 justify-center">
+          <v-card v-if="(model.applicableSector == 100000001 && model.belongsToUnion == 1 && model.optInECEWE == 1 && model.publicSector == 1 && languageYearLabel != programYearTypes.HISTORICAL) || (model.applicableSector == 100000001 &&  model.belongsToUnion == 1 && model.optInECEWE == 1 && languageYearLabel == programYearTypes.HISTORICAL) || isLoading" class="mx-2 mb-4 justify-center">
             <v-row v-if="!isLoading" >
               <v-col class="py-0">
                 <v-card-title class="py-0 noticeInfo">
@@ -292,7 +332,7 @@
 
 <script>
 
-import { PATHS, changeUrl, pcfUrl } from '@/utils/constants';
+import { PATHS, changeUrl, pcfUrl, PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants';
 import { mapGetters, mapState, mapActions, mapMutations } from 'vuex';
 import alertMixin from '@/mixins/alertMixin';
 import NavButton from '@/components/util/NavButton';
@@ -308,12 +348,14 @@ export default {
       model: {},
       isLoading: false, // flag to UI if screen is getting data or not.
       isProcessing: false, // flag to UI if screen is saving/processing data or not.
+      isValidForm : false,
     };
   },
   computed: {
     ...mapGetters('auth', ['userInfo']),
     ...mapState('eceweApp', ['isStarted','eceweModel', 'loadedFacilities','optinECEWEChangeRequestReadonly', 'belongsToUnionChangeRequestReadonly']),
     ...mapState('app', ['fundingModelTypeList']),
+    ...mapGetters('app', ['getFundingUrl', 'getLanguageYearLabel']),
     ...mapState('navBar', ['navBarList', 'changeRequestId']),
     ...mapState('application', ['formattedProgramYear', 'programYearId', 'applicationStatus', 'unlockEcewe', 'applicationId']),
     ...mapGetters('navBar', ['previousPath', 'isChangeRequest']),
@@ -326,16 +368,21 @@ export default {
         return this.$store.state.eceweApp.facilities?.filter(el => !el.changeRequestId);
       }
     },
+    fundingUrl(){
+      return this.getFundingUrl(this.programYearId);
+    },
+    languageYearLabel(){
+      return this.getLanguageYearLabel;
+    },
+    programYearTypes(){
+      return PROGRAM_YEAR_LANGUAGE_TYPES;
+    },
     facilities: {
       get() { return this.filteredECEWEFacilityList; },
       set(value) { this.$store.commit('eceweApp/setFacilities', value); }
     },
     enableButtons() {
-      return (this.model.belongsToUnion === 1 && this.model.applicableSector == 100000000 && (this.model.fundingModel === this.fundingModelTypeList[1].id || this.model.fundingModel === this.fundingModelTypeList[2].id) && this.model.confirmation === 1)
-            ||(this.model.belongsToUnion === 1 && this.model.applicableSector == 100000000 && this.model.fundingModel === this.fundingModelTypeList[0].id)
-            ||(this.model.belongsToUnion === 1 && this.model.applicableSector == 100000001 && this.model.confirmation === 1)
-            ||this.model.belongsToUnion === 0
-            ||this.model.optInECEWE === 0;
+      return this.isValidForm;
     },
   },
   async mounted() {
@@ -406,7 +453,7 @@ export default {
       }
     },
     validateForm() {
-      this.$refs.form?.validate();
+      this.$refs.isValidForm?.validate();
     },
     /* Determines if all facilites are currently opted out. */
     allFacilitiesOptedOut() {
@@ -460,13 +507,6 @@ export default {
     optOutFacilities() {
       //this was modified by JB to try and fix bugs with the checkmarks.
       //instead of running map - I update the facility and nav bar with the opt out status.
-
-      // this.facilities = this.facilities.map(facility => {
-      //   if (facility.optInOrOut != 0) {
-      //     facility.optInOrOut = 0;
-      //   }
-      //   return facility;
-      // });
       this.navBarList.forEach(facility => {
         facility.eceweOptInStatus = 0;
       });
diff --git a/frontend/src/components/mtfi/CurrentFeeVerification.vue b/frontend/src/components/mtfi/CurrentFeeVerification.vue
index 64b44023..31d5c3a4 100644
--- a/frontend/src/components/mtfi/CurrentFeeVerification.vue
+++ b/frontend/src/components/mtfi/CurrentFeeVerification.vue
@@ -637,7 +637,7 @@
               <p class="pt-4">You have entered a parent fee above the {{formattedProgramYear}} parent fee increase limit for the following care categories:<br><br>
                 <span v-for="item in rfi3percentCategories" :key="item">{{item}}<br></span>
               </p>
-              <p>Parent fee increases over the limit will be assessed under the Parent Fee Increase Exceptions policy in the {{formattedProgramYear}} <a href="https://www2.gov.bc.ca/assets/download/3013BFFE26E24901A2EE764FC17FD05E" target="_blank">Funding Guidelines</a>. You can continue to the Request for Information section or press back to update your fees.</p>
+              <p>Parent fee increases over the limit will be assessed under the Parent Fee Increase Exceptions policy in the {{formattedProgramYear}} <a :href="fundingUrl"  target="_blank">Funding Guidelines</a>. You can continue to the Request for Information section or press back to update your fees.</p>
               <p class="pt-4">Please confirm you have provided your highest full-time (i.e. over 4 hours, 5 days a week) parent fee for each care category before CCFRI is applied. Submit your daily parent fee if you only offer care for 4 days or fewer per week.</p>
               <v-btn dark color="secondary" class="mr-10" @click="closeDialog()">Back</v-btn>
               <v-btn dark color="primary" @click="toRfi()">Continue</v-btn>
@@ -732,6 +732,7 @@ export default {
     ...mapState('navBar', ['navBarList', 'userProfileList', 'changeRequestMap']),
     ...mapGetters('navBar', ['previousPath', 'nextPath','getNavByCCFRIId']),
     ...mapGetters('reportChanges',['changeRequestStatus']),
+    ...mapGetters('app', [ 'getFundingUrl']),
     areFeesCorrect() {
       return this.CCFRIFacilityModel.existingFeesCorrect == '100000001' ? true : false;
     },
@@ -746,7 +747,10 @@ export default {
         return true;
       }
       return false;
-    }
+    },
+    fundingUrl(){
+      return this.getFundingUrl(this.programYearId);
+    },
   },
   watch: {
     //get facilityID from here and then set it !
diff --git a/frontend/src/components/requestChanges/ChangeInformation.vue b/frontend/src/components/requestChanges/ChangeInformation.vue
index 2d299d3c..b726b39e 100644
--- a/frontend/src/components/requestChanges/ChangeInformation.vue
+++ b/frontend/src/components/requestChanges/ChangeInformation.vue
@@ -17,7 +17,7 @@
             <li>Services outlined in Schedule A of your Child Care Operating Funding Agreement</li>
           </ul>
           <br>
-          To ensure accurate payments, please notify us of any changes <b>before</b> submitting an enrolment report of a monthly ECE report.
+          To ensure accurate payments, please notify us of any changes <b>before</b> submitting an Enrolment report or a monthly ECE report.
         </p>
           <v-card outlined class="mx-10">
 
@@ -57,7 +57,6 @@
   </template>
 
 <script>
-import { mapState, mapMutations, mapActions, mapGetters } from 'vuex';
 import { PATHS } from '@/utils/constants';
 import alertMixin from '@/mixins/alertMixin';
 import NavButton from '@/components/util/NavButton';
@@ -80,7 +79,7 @@ export default {
       this.$router.push(PATHS.ROOT.HOME);
     },
     next(){
-        this.$router.push(PATHS.ROOT.CHANGE_LANDING);
+      this.$router.push(PATHS.ROOT.CHANGE_LANDING);
     },
   },
   components: { NavButton}
@@ -92,4 +91,4 @@ export default {
   margin: auto;
 }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/components/requestChanges/SummaryDeclarationChangeRequest.vue b/frontend/src/components/requestChanges/SummaryDeclarationChangeRequest.vue
index e1d81c15..268ca6e9 100644
--- a/frontend/src/components/requestChanges/SummaryDeclarationChangeRequest.vue
+++ b/frontend/src/components/requestChanges/SummaryDeclarationChangeRequest.vue
@@ -142,6 +142,11 @@
 
       <!---Declaration Start--->
       <v-row justify="center">
+
+        <v-row v-if="fundingAgreementNumber" justify="center" class="pt-4 text-h5" style="color:#003466;">
+          Funding Agreement Number: {{ fundingAgreementNumber }}
+        </v-row>
+
         <v-card class="py-0 px-3 mx-0 mt-10 rounded-lg col-11" elevation="4">
 
             <v-row>
@@ -366,7 +371,7 @@ export default {
     ...mapGetters('navBar', ['previousPath']),
     ...mapGetters('reportChanges', ['getChangeNotificationActionId']),
     ...mapState('navBar', ['changeType']),
-    ...mapState('organization', ['organizationAccountNumber']),
+    ...mapState('organization', ['organizationAccountNumber', 'fundingAgreementNumber']),
     ...mapState('summaryDeclaration', ['isSummaryLoading', 'isMainLoading', 'isLoadingComplete']),
     ...mapState('summaryDeclaration', ['summaryModel', 'model']),
     ...mapState('application', ['isRenewal', 'applicationMap']),
diff --git a/frontend/src/components/summary/group/ECEWESummary.vue b/frontend/src/components/summary/group/ECEWESummary.vue
index 4e2869cf..bea3605c 100644
--- a/frontend/src/components/summary/group/ECEWESummary.vue
+++ b/frontend/src/components/summary/group/ECEWESummary.vue
@@ -29,6 +29,8 @@
           </v-col>
         </v-row>
       </v-col>
+    </v-row>
+    <v-row>
       <v-col v-if="ecewe?.optInECEWE == 1" cols="12" lg="6" class="pb-0 pt-0">
         <v-row no-gutters class="d-flex justify-start">
           <v-col cols="12" class="d-flex justify-start">
@@ -39,7 +41,17 @@
       </v-col>
     </v-row>
       <v-row v-if="!facilityInformationExists()" class="d-flex justify-start">
-        <v-col v-if="ecewe?.optInECEWE == 1 && ecewe?.belongsToUnion == 1 " cols="12" lg="6" class="pb-0 pt-0">
+        <div v-if="languageYearLabel != programYearTypes.HISTORICAL">
+          <v-col v-if="ecewe?.optInECEWE == 1" cols="12" lg="6" class="pb-0 pt-0">
+            <v-row no-gutters class="d-flex justify-start">
+              <v-col cols="12" class="d-flex justify-start">
+                <span class="summary-label pt-3">Are you a public sector employer, as defined in the Public Sector Employers Act?</span>
+                <v-text-field placeholder="Required"  :value="this.getYesNoValue(ecewe?.publicSector)" class="summary-value" dense flat solo hide-details readonly :rules="rules.required" ></v-text-field>
+              </v-col>
+            </v-row>
+          </v-col>
+        </div>
+        <v-col v-if="ecewe?.optInECEWE == 1 && ecewe?.belongsToUnion == 1 && ecewe?.publicSector == 1 " cols="12" lg="6" class="pb-0 pt-0">
           <v-row no-gutters class="d-flex justify-start">
             <v-col cols="12" class="d-flex justify-start">
               <span class="summary-label pt-3">Applicable Sector:</span>
@@ -86,9 +98,9 @@
 </template>
 <script>
 
-import {mapState} from 'vuex';
+import {mapState, mapGetters} from 'vuex';
 import { isChangeRequest } from '@/utils/common';
-import { PATHS, pcfUrl, changeUrl } from '@/utils/constants';
+import { PATHS, pcfUrl, changeUrl, PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants';
 import rules from '@/utils/rules';
 
 export default {
@@ -119,6 +131,13 @@ export default {
     ...mapState('application', ['formattedProgramYear']),
     ...mapState('summaryDeclaration', ['isLoadingComplete']),
     ...mapState('app', ['fundingModelTypeList']),
+    ...mapGetters('app', ['getFundingUrl', 'getLanguageYearLabel']),
+    languageYearLabel(){
+      return this.getLanguageYearLabel;
+    },
+    programYearTypes(){
+      return PROGRAM_YEAR_LANGUAGE_TYPES;
+    },
   },
   data() {
     return {
diff --git a/frontend/src/components/summary/group/RFISummary.vue b/frontend/src/components/summary/group/RFISummary.vue
index d3d32e32..1a313cd6 100644
--- a/frontend/src/components/summary/group/RFISummary.vue
+++ b/frontend/src/components/summary/group/RFISummary.vue
@@ -174,12 +174,14 @@
           </v-col>
           <v-col class="col-12" v-if="rfiApp?.feeIncreaseDueToWage">
             <v-row no-gutters class="d-flex">
-              <v-col class="col-6 pr-4">
-                <v-row no-gutters class="d-flex">
-                  <span class="summary-label pt-3">Was the wage increase committed to (in writing) before the January 2022 release of the Funding Guidelines?</span>
-                  <v-text-field placeholder="Required" class="summary-value" :value="getValueString(rfiApp?.increaseInWriting)" dense flat solo hide-details  required :rules="rules.required" ></v-text-field>
-                </v-row>
-              </v-col>
+              <div v-if="languageYearLabel == programYearTypes.HISTORICAL">
+                <v-col class="col-6 pr-4">
+                  <v-row no-gutters class="d-flex">
+                    <span class="summary-label pt-3">Was the wage increase committed to (in writing) before the January 2022 release of the Funding Guidelines?</span>
+                    <v-text-field placeholder="Required" class="summary-value" :value="getValueString(rfiApp?.increaseInWriting)" dense flat solo hide-details  required :rules="rules.required" ></v-text-field>
+                  </v-row>
+                </v-col>
+              </div>
               <v-col class="col-6 pr-4">
                 <v-row no-gutters class="d-flex">
                   <span class="summary-label pt-3">Is the wage increase part of a collective bargaining agreement for Direct Care Staff at the facility?</span>
@@ -580,7 +582,7 @@
   </v-row>
 </template>
 <script>
-import { PATHS, pcfUrlGuid, changeUrlGuid, CHANGE_TYPES } from '@/utils/constants';
+import { PATHS, pcfUrlGuid, changeUrlGuid, CHANGE_TYPES, PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants';
 import rules from '@/utils/rules';
 import { mapState, mapGetters } from 'vuex';
 
@@ -589,6 +591,13 @@ export default {
   computed: {
     ...mapState('summaryDeclaration', ['isLoadingComplete']),
     ...mapGetters('navBar', ['isChangeRequest']),
+    ...mapGetters('app', [ 'getFundingUrl', 'getLanguageYearLabel']),
+    languageYearLabel(){
+      return this.getLanguageYearLabel;
+    },
+    programYearTypes(){
+      return PROGRAM_YEAR_LANGUAGE_TYPES;
+    },
   },
   props: {
     rfiApp: {
diff --git a/frontend/src/store/modules/app.js b/frontend/src/store/modules/app.js
index a297c73e..a045501a 100644
--- a/frontend/src/store/modules/app.js
+++ b/frontend/src/store/modules/app.js
@@ -1,4 +1,5 @@
 import ApiService from '@/common/apiService';
+import { PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants';
 
 export default {
   namespaced: true,
@@ -84,6 +85,22 @@ export default {
     fundingModelTypeList: state => state.fundingModelTypeList,
     lookupInfo: state => state.lookupInfo,
     logoutCounter: state => state.logoutCounter < 0 ? 0 : state.logoutCounter,
+    getFundingUrl:  state => (programYearId) => {
+      console.log();
+      return state?.programYearList.list.find(el => el.programYearId == programYearId)?.fundingGuidelinesUrl;
+    },
+
+    //rootState.navBar
+    getLanguageYearLabel: (state, getters, rootState) => {
+      const orderNumber = state?.programYearList.list.find(el => el.programYearId == rootState?.application?.programYearId)?.order;
+      if (orderNumber < 5){
+        return PROGRAM_YEAR_LANGUAGE_TYPES.HISTORICAL;
+      }
+      else{
+        return PROGRAM_YEAR_LANGUAGE_TYPES.FY2024_25;
+      }
+      //could write more statements if year specific language is required
+    },
   },
   actions: {
     async getLookupInfo({ commit }) {
diff --git a/frontend/src/store/modules/ccfriApp.js b/frontend/src/store/modules/ccfriApp.js
index ecfdf070..0a2808d1 100644
--- a/frontend/src/store/modules/ccfriApp.js
+++ b/frontend/src/store/modules/ccfriApp.js
@@ -1,5 +1,5 @@
 import ApiService from '@/common/apiService';
-import { ApiRoutes } from '@/utils/constants';
+import { ApiRoutes, PROGRAM_YEAR_LANGUAGE_TYPES } from '@/utils/constants';
 import { checkSession } from '@/utils/session';
 import { deepCloneObject } from '../../utils/common';
 import { isEqual } from 'lodash';
@@ -226,13 +226,24 @@ export default {
       const previousProgramYearId = previousProgramYear.programYearId;
       //console.log('getCcfriOver3percent.currentRFI: ', state.CCFRIFacilityModel);
       const threePercentMedian = getters.getCCFRIMedianById(currentCcfri? currentCcfri.ccfriApplicationId : state.ccfriId);
+      console.log(threePercentMedian);
       state.CCFRIFacilityModel.childCareTypes.filter( filterItem => filterItem.programYearId == currentProgramYearId)
         .forEach(careType => {
           console.log(`Determining RFI for : [${careType.childCareCategory}] using Current Year: [${currentProgramYear.name}] and Last Year [${previousProgramYear.name}]`);
           let previousCareType = getPreviousCareType((currentCcfri? currentCcfri : state.CCFRIFacilityModel), careType, previousProgramYearId, getters, rootState);
           if (previousCareType) {
             console.log('previousCare Type found, testing RFI median fees: ', previousCareType);
-            let allowedDifference = threePercentMedian ? threePercentMedian[careType.childCareCategory] : null;
+            let allowedDifference;
+
+            if(careType.childCareCategory == 'Kindergarten'){
+              allowedDifference = threePercentMedian ? threePercentMedian['Out of School Care - Kindergarten'] : null;
+            }
+            else if(careType.childCareCategory == 'Grade 1 to Age 12'){
+              allowedDifference = threePercentMedian ? threePercentMedian['Out of School Care - Grade 1+'] : null;
+            }
+            else {
+              allowedDifference = threePercentMedian ? threePercentMedian[careType.childCareCategory] : null;
+            }
             if (allowedDifference) {
               console.log(`Testing RFI median difference using [${allowedDifference}] for [${careType.childCareCategory}]`);
               if (isOver3Percent(careType, previousCareType, allowedDifference)) {
@@ -330,7 +341,7 @@ export default {
       }
       //}
     },
-    async decorateWithCareTypes({commit, dispatch, state, rootState}, facilityId) {
+    async decorateWithCareTypes({commit, dispatch, state, rootState, rootGetters}, facilityId) {
       const  ccofProgramYearId = rootState.application.programYearId;
       const programYearList = rootState.app.programYearList.list;
 
@@ -446,14 +457,32 @@ export default {
           }
         });
 
+        state.CCFRIFacilityModel.childCareTypes.push(...careTypes);
 
+        //IF not historical year - find Kindergarten & Out of school care in child cat lookup
+        //then check if they are in the CCFRI fac model. If so - rename them
+        console.log(rootGetters['app/getLanguageYearLabel']);
+        if (rootGetters['app/getLanguageYearLabel'] != PROGRAM_YEAR_LANGUAGE_TYPES.HISTORICAL){
+          const ooscK = rootState?.app?.childCareCategoryList?.find(el => el.ccof_name=="OOSC-K");
+          const ooscG = rootState?.app?.childCareCategoryList?.find(el => el.ccof_name=="OOSC-G");
 
+          //OOSC and OOSK always exist together - so we just have to find one of them in the array
+          let schoolAgeFound = state.CCFRIFacilityModel.childCareTypes.find(el => el.childCareCategoryId == ooscK.ccof_childcare_categoryid);
+          if (schoolAgeFound){
+            state.CCFRIFacilityModel.childCareTypes.forEach(category => {
 
-        state.CCFRIFacilityModel.childCareTypes.push(...careTypes);
+              if (category.childCareCategoryId == ooscK.ccof_childcare_categoryid){
+                category.childCareCategory = 'Kindergarten';
+              }
+              else if (category.childCareCategoryId == ooscG.ccof_childcare_categoryid){
+                category.childCareCategory = 'Grade 1 to Age 12';
+              }
+            });
+          }
+        }
 
         //sort them by age asc
         state.CCFRIFacilityModel.childCareTypes.sort((a, b) => a.orderNumber - b.orderNumber);
-
         //then sort by prev year first
         state.CCFRIFacilityModel.childCareTypes.sort((a, b) =>{
           const nameA = a.programYear.toUpperCase(); // ignore upper and lowercase
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index ce4a543b..192a78ab 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -205,3 +205,10 @@ export const CHANGE_REQUEST_EXTERNAL_STATUS = {
   APPROVED: 5,
   CANCELLED: 6
 };
+
+export const PROGRAM_YEAR_LANGUAGE_TYPES = {
+  HISTORICAL: "HISTORICAL",
+  FY2024_25: "FY2024_25",
+  FY2025_26: "FY2025_26",
+};
+