diff --git a/package-lock.json b/package-lock.json
index b3330e2f4..2cdaf0649 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-filings-ui",
-  "version": "7.4.9",
+  "version": "7.4.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-filings-ui",
-      "version": "7.4.9",
+      "version": "7.4.10",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/base-address": "2.0.9",
@@ -16,7 +16,7 @@
         "@bcrs-shared-components/court-order-poa": "2.1.4",
         "@bcrs-shared-components/date-picker": "1.2.39",
         "@bcrs-shared-components/document-delivery": "1.2.1",
-        "@bcrs-shared-components/enums": "1.1.17",
+        "@bcrs-shared-components/enums": "1.1.18",
         "@bcrs-shared-components/expandable-help": "1.0.1",
         "@bcrs-shared-components/folio-number-input": "1.1.18",
         "@bcrs-shared-components/interfaces": "1.1.13",
@@ -328,9 +328,9 @@
       }
     },
     "node_modules/@bcrs-shared-components/enums": {
-      "version": "1.1.17",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.1.17.tgz",
-      "integrity": "sha512-tCL1TPzKyjcctFOYO2V6cQFCJq+8FcCQgWD1ezl22VMmPDqCwajCe6ydc0NDM4BUgwuPu+HCwIUkJpcwXK7C7Q==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.1.18.tgz",
+      "integrity": "sha512-kXN7bGeQReYqueb7xal6Ift/n+BvJnyQuwz5bkHZTbT4zk+JFe9hc9RAI2rhMrIctaR1tnCBXnvUF3Kv4DsjeQ==",
       "dependencies": {
         "@bcrs-shared-components/corp-type-module": "^1.0.16"
       }
diff --git a/package.json b/package.json
index d0e02e29b..6cbac5fc2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-filings-ui",
-  "version": "7.4.9",
+  "version": "7.4.10",
   "private": true,
   "appName": "Filings UI",
   "sbcName": "SBC Common Components",
@@ -25,7 +25,7 @@
     "@bcrs-shared-components/court-order-poa": "2.1.4",
     "@bcrs-shared-components/date-picker": "1.2.39",
     "@bcrs-shared-components/document-delivery": "1.2.1",
-    "@bcrs-shared-components/enums": "1.1.17",
+    "@bcrs-shared-components/enums": "1.1.18",
     "@bcrs-shared-components/expandable-help": "1.0.1",
     "@bcrs-shared-components/folio-number-input": "1.1.18",
     "@bcrs-shared-components/interfaces": "1.1.13",
diff --git a/src/assets/styles/theme.scss b/src/assets/styles/theme.scss
index 4bdc381c7..8e47ff06c 100644
--- a/src/assets/styles/theme.scss
+++ b/src/assets/styles/theme.scss
@@ -67,6 +67,7 @@ $app-almost-black: #000014;
 $app-bg-lt-blue: #e2e8ee;
 $app-blue: #1669bb;
 $app-dk-blue: #38598a; // same as the Vuetify theme appDkBlue
+$app-lt-red: #fae9e9;
 $app-red: #d3272c;
 $app-green: #1a9031;
 $app-alert: #F8661A;
@@ -84,4 +85,4 @@ $px-24: 1.5000rem;
 $px-28: 1.7500rem;
 $px-32: 2.0000rem;
 $px-34: 2.1250rem;
-$px-36: 2.2500rem;
\ No newline at end of file
+$px-36: 2.2500rem;
diff --git a/src/components/NoticeOfWithdrawal/PlanOfArrangement.vue b/src/components/NoticeOfWithdrawal/PlanOfArrangement.vue
deleted file mode 100644
index 4cc244c2a..000000000
--- a/src/components/NoticeOfWithdrawal/PlanOfArrangement.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-<template>
-  <div id="withdrawal-poa">
-    <v-row no-gutters>
-      <v-col
-        cols="12"
-        sm="3"
-        class="pr-4"
-      >
-        <label
-          id="court-order-label"
-          :class="{'error-text': invalidSection}"
-        >Court Order Number</label>
-      </v-col>
-      <v-col
-        cols="12"
-        :sm="9"
-      >
-        <p class="grey-text">
-          Provide a court order number if this record is part of a court order or a plan of arrangement.
-        </p>
-        <v-form
-          id="court-num-form"
-          ref="courtNumRef"
-          v-model="valid"
-        >
-          <v-text-field
-            id="court-order-number-input"
-            v-model="courtOrderNumber"
-            label="Court Order Number"
-            :rules="courtOrderNumRules"
-            filled
-          />
-        </v-form>
-      </v-col>
-    </v-row>
-    <v-row no-gutters>
-      <v-col
-        cols="12"
-        sm="3"
-        class="pr-4"
-      >
-        <label id="poa-label">Plan of Arrangement</label>
-      </v-col>
-      <v-col
-        cols="12"
-        :sm="9"
-      >
-        <p class="grey-text">
-          If you want to withdraw a record that is part of a plan of arrangement,
-          you must withdraw all records related to the arrangement.
-          This must be done before any of the terms of the arrangement take effect.
-        </p>
-        <v-checkbox
-          id="plan-of-arrangement-checkbox"
-          v-model="planOfArrangement"
-          class="mt-0 pt-0"
-          hide-details
-          label="The record to be withdrawn was filed as part of an arrangement."
-        />
-      </v-col>
-    </v-row>
-    <v-row
-      no-gutters
-      class="pt-4"
-    >
-      <v-col
-        cols="12"
-        sm="3"
-        class="pr-4"
-      />
-      <v-col
-        cols="12"
-        :sm="9"
-      >
-        <v-checkbox
-          id="come-into-effect-checkbox"
-          v-model="comeIntoEffect"
-          class="mt-0 pt-0"
-          hide-details
-          label="One or more of the provisions of the arrangement have come into effect."
-          :disabled="!planOfArrangement"
-        />
-      </v-col>
-    </v-row>
-  </div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue'
-import { Component, Emit, Prop, Watch } from 'vue-property-decorator'
-import { FormIF } from '@bcrs-shared-components/interfaces'
-
-@Component({})
-export default class PlanOfArrangement extends Vue {
-  // Refs
-  $refs!: Vue['$refs'] & {
-    courtNumRef: FormIF
-  }
-
-  /** Draft court order number. */
-  @Prop({ default: '' }) readonly draftCourtOrderNumber!: string
-
-  /** Draft plan of arrangement. */
-  @Prop({ default: false }) readonly hasDraftPlanOfArrangement!: boolean
-
-  /** Draft come into effect. */
-  @Prop({ default: false }) readonly hasDraftComeIntoEffect!: boolean
-
-  /** Prompt Error. */
-  @Prop({ default: false }) readonly invalidSection!: boolean
-
-  // Local properties
-  private courtOrderNumber = ''
-  private courtOrderNumRules = []
-  private planOfArrangement = false
-  private comeIntoEffect = false
-  private valid = false
-
-  /** Called when component is mounted. */
-  mounted (): void {
-    // Set default draft values if they exist
-    if (this.draftCourtOrderNumber) this.courtOrderNumber = this.draftCourtOrderNumber
-    if (this.hasDraftPlanOfArrangement) this.planOfArrangement = this.hasDraftPlanOfArrangement
-    if (this.hasDraftComeIntoEffect) this.comeIntoEffect = this.hasDraftComeIntoEffect
-  }
-
-  /** Clear rules and reset validations. */
-  private clearValidations (): void {
-    this.courtOrderNumRules = []
-    this.$refs.courtNumRef.resetValidation()
-  }
-
-  /** Triggers the form validation. */
-  public validate (): boolean {
-    return this.$refs.courtNumRef.validate()
-  }
-
-  @Watch('planOfArrangement')
-  @Watch('courtOrderNumber')
-  @Watch('courtOrderNumberRequired')
-  validateCourtNum (): void {
-    // Apply TextField rules
-    this.courtOrderNumRules = [
-      (v: string) => (!v || !/^\s/g.test(v)) || 'Invalid spaces', // leading spaces
-      (v: string) => (!v || !/\s$/g.test(v)) || 'Invalid spaces', // trailing spaces
-      (v: string) => (!v || !(v.length < 5)) || 'Court order number is invalid', // too short
-      (v: string) => (!v || !(v.length > 20)) || 'Court order number is invalid' // too long
-    ]
-    if (this.planOfArrangement) {
-      this.courtOrderNumRules.push((v: string) => !!v || 'A Court Order number is required')
-    }
-    this.$refs.courtNumRef.validate()
-  }
-
-  @Watch('planOfArrangement')
-  private onPlanOfArrangementChange (newVal: boolean): void {
-    // If planOfArrangement is false, reset comeIntoEffect to false
-    if (!newVal) {
-      this.comeIntoEffect = false
-    }
-  }
-
-  /** Emit court order number. */
-  @Watch('courtOrderNumber')
-  @Emit('courtNumber')
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  emitCourtNumber (courtNumber: string): void {}
-
-  /** Emit plan of arrangement. */
-  @Watch('planOfArrangement')
-  @Emit('planOfArrangement')
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  emitPoa (planOfArrangement: boolean): void {}
-
-  /** Emit come into effect. */
-  @Watch('comeIntoEffect')
-  @Emit('comeIntoEffect')
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  emitEffect (planOfArrangement: boolean): void {}
-
-  /** Emit valid. */
-  @Watch('valid')
-  @Emit('valid')
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  private emitValid (valid: boolean): void {}
-}
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/styles/theme.scss';
-
-#poa-label, #court-order-label {
-  font-weight: bold;
-  color: $gray9;
-}
-
-:deep() {
-  .v-card__actions {
-    justify-content: flex-end;
-  }
-
-  .v-input .v-label {
-    font-weight: normal;
-    color: $gray7;
-  }
-
-  .theme--light.v-input input {
-    font-weight: normal;
-    color: $gray7;
-  }
-}
-</style>
diff --git a/src/components/NoticeOfWithdrawal/RecordToBeWithdrawn.vue b/src/components/NoticeOfWithdrawal/RecordToBeWithdrawn.vue
index 744d0f420..ce2b156b5 100644
--- a/src/components/NoticeOfWithdrawal/RecordToBeWithdrawn.vue
+++ b/src/components/NoticeOfWithdrawal/RecordToBeWithdrawn.vue
@@ -11,7 +11,7 @@
     <template #content>
       <v-row
         no-gutters
-        class="px-6 py-6"
+        class="px-5 py-4"
       >
         <v-col
           cols="12"
@@ -24,6 +24,7 @@
           id="withdrawal-filing-type"
           cols="12"
           sm="9"
+          class="grey-text"
         >
           {{ getFilingToBeWithdrawn().displayName }}
         </v-col>
@@ -31,7 +32,7 @@
 
       <v-row
         no-gutters
-        class="px-6 py-6"
+        class="px-5 py-4"
       >
         <v-col
           cols="12"
@@ -43,6 +44,7 @@
           id="withdrawal-filing-number"
           cols="12"
           sm="9"
+          class="grey-text"
         >
           {{ filingToBeWithdrawn }}
         </v-col>
@@ -50,7 +52,7 @@
 
       <v-row
         no-gutters
-        class="px-6 py-6"
+        class="px-5 py-4"
       >
         <v-col
           cols="12"
@@ -62,32 +64,134 @@
           id="withdrawal-filing-date"
           cols="12"
           sm="9"
+          class="grey-text"
         >
           {{ getFormattedFilingDate() }}
         </v-col>
       </v-row>
+
+      <v-divider class="mt-2 mx-4" />
+
+      <v-row
+        no-gutters
+        class="px-5 pt-6"
+      >
+        <v-col
+          cols="12"
+          sm="3"
+        >
+          <strong>Plan of Arrangement</strong>
+        </v-col>
+        <v-col
+          cols="12"
+          sm="9"
+        >
+          <p class="grey-text">
+            If you want to withdraw a record that is part of a plan of arrangement,
+            you must withdraw all records related to the arrangement.
+            This must be done before any of the terms of the arrangement take effect.
+          </p>
+          <v-checkbox
+            id="plan-of-arrangement-checkbox"
+            v-model="partOfPoa"
+            class="mt-0 pt-0"
+            hide-details
+          >
+            <template #label>
+              <span class="font-14 grey-text">The record to be withdrawn is part of a Plan of Arrangement.</span>
+            </template>
+          </v-checkbox>
+        </v-col>
+      </v-row>
+      <v-row
+        no-gutters
+        class="px-5 pt-4 pb-8"
+      >
+        <v-col
+          cols="12"
+          sm="3"
+        />
+        <v-col
+          cols="12"
+          sm="9"
+          class="pt-0"
+        >
+          <v-checkbox
+            id="has-taken-effect-checkbox"
+            v-model="hasTakenEffect"
+            class="mt-0 pt-0"
+            hide-details
+            :disabled="!partOfPoa"
+          >
+            <template #label>
+              <span class="font-14 grey-text">
+                At least one of the terms of the arrangement have taken effect.
+              </span>
+            </template>
+          </v-checkbox>
+          <MessageBox
+            v-if="hasTakenEffect"
+            id="poa-error"
+            class="mt-6"
+            color="red"
+          >
+            <header>
+              <v-icon
+                color="red"
+                class="error-icon"
+              >
+                mdi-alert
+              </v-icon>
+              <strong class="pl-2 gray9--text text-small-text">Warning</strong>
+            </header>
+            <article class="pl-8 pt-1 small-text">
+              If you want to withdraw a record that is part of a Plan of Arrangement,
+              you must withdraw all records related to the arrangement.
+              This must be done before any of the provisions of the arrangement take effect.
+            </article>
+          </MessageBox>
+        </v-col>
+      </v-row>
     </template>
   </VcardTemplate>
 </template>
 
 <script lang="ts">
-import { Component, Prop, Mixins } from 'vue-property-decorator'
+import { Component, Prop, Mixins, Emit, Watch } from 'vue-property-decorator'
 import { DateMixin } from '@/mixins'
 import { Getter } from 'pinia-class'
-import { VcardTemplate } from '@/components/common'
+import { MessageBox, VcardTemplate } from '@/components/common'
 import { ApiFilingIF } from '@/interfaces'
 import { useFilingHistoryListStore } from '@/stores/filingHistoryListStore'
 
 @Component({
   components: {
+    MessageBox,
     VcardTemplate
   }
 })
 export default class RecordToBeWithdrawn extends Mixins(DateMixin) {
   @Prop({ required: true }) readonly filingToBeWithdrawn!: string
 
+  /** Draft part of a POA (plan of arrangement). */
+  @Prop({ default: false }) readonly hasDraftPartOfPoa!: boolean
+
+  /** Draft has taken effect. */
+  @Prop({ default: false }) readonly hasDraftTakenEffect!: boolean
+
   @Getter(useFilingHistoryListStore) getFilings!: Array<ApiFilingIF>
 
+  // Local properties
+  private partOfPoa = false
+  private hasTakenEffect = false
+
+  /** Called when component is mounted. */
+  mounted (): void {
+    // Set default draft values if they exist
+    if (this.hasDraftPartOfPoa) this.partOfPoa = this.hasDraftPartOfPoa
+    if (this.hasDraftTakenEffect) this.hasTakenEffect = this.hasDraftTakenEffect
+  }
+
   getFilingToBeWithdrawn (): ApiFilingIF | null {
     const filingId = Number(this.filingToBeWithdrawn)
     const filings = this.getFilings as ApiFilingIF[]
@@ -102,5 +206,25 @@ export default class RecordToBeWithdrawn extends Mixins(DateMixin) {
     }
     return 'Invalid date'
   }
+
+  @Watch('partOfPoa')
+  private onpartOfPoaChange (newVal: boolean): void {
+    // If partOfPoa is false, reset hasTakenEffect to false
+    if (!newVal) {
+      this.hasTakenEffect = false
+    }
+  }
+
+  /** Emit plan of arrangement. */
+  @Watch('partOfPoa')
+  @Emit('partOfPoa')
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  emitPoa (partOfPoa: boolean): void {}
+
+  /** Emit come into effect. */
+  @Watch('hasTakenEffect')
+  @Emit('hasTakenEffect')
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  emitEffect (hasTakenEffect: boolean): void {}
 }
 </script>
diff --git a/src/components/common/MessageBox.vue b/src/components/common/MessageBox.vue
new file mode 100644
index 000000000..ab7518da0
--- /dev/null
+++ b/src/components/common/MessageBox.vue
@@ -0,0 +1,45 @@
+<template>
+  <v-card
+    outlined
+    class="rounded-0 ma-0"
+    :class="{
+      'message-box-gold': color === 'gold',
+      'message-box-red': color === 'red'
+    }"
+  >
+    <div class="mx-7 my-5 pa-0">
+      <slot />
+    </div>
+  </v-card>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator'
+
+@Component({})
+export default class MessageBox extends Vue {
+    @Prop({ required: true }) readonly color!: 'gold' | 'red'
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+
+.v-card {
+div {
+    font-size: $px-14;
+    letter-spacing: 0.01rem;
+    color: $gray7;
+}
+}
+
+.message-box-gold {
+background-color: $BCgovGold0 !important;
+border-color: $BCgovGold5 !important;
+}
+
+.message-box-red {
+background-color: $app-lt-red !important;
+border-color: $app-red !important;
+}
+</style>
diff --git a/src/components/common/index.ts b/src/components/common/index.ts
index b702225ef..72bf81ef6 100644
--- a/src/components/common/index.ts
+++ b/src/components/common/index.ts
@@ -8,6 +8,7 @@ import EffectiveDate from './EffectiveDate.vue'
 import FileUploadPdf from './FileUploadPdf.vue'
 import ForeignJurisdiction from './ForeignJurisdiction.vue'
 import ImportantMessage from './ImportantMessage.vue'
+import MessageBox from './MessageBox.vue'
 import NameRequestInfo from './NameRequestInfo.vue'
 import OfficeAddresses from './OfficeAddresses.vue'
 import Stepper from '@/components/common/Stepper.vue'
@@ -30,6 +31,7 @@ export {
   FileUploadPdf,
   ForeignJurisdiction,
   ImportantMessage,
+  MessageBox,
   NameRequestInfo,
   OfficeAddresses,
   Stepper,
diff --git a/src/enums/effectOfOrderTypes.ts b/src/enums/effectOfOrderTypes.ts
index 95d2ac85a..079a63949 100644
--- a/src/enums/effectOfOrderTypes.ts
+++ b/src/enums/effectOfOrderTypes.ts
@@ -1,4 +1,3 @@
 export enum EffectOfOrderTypes {
-  PLAN_OF_ARRANGEMENT = 'planOfArrangement',
-  ARRANGEMENT_EFFECT = 'arrangementEffect'
+  PLAN_OF_ARRANGEMENT = 'planOfArrangement'
 }
diff --git a/src/services/enum-utilities.ts b/src/services/enum-utilities.ts
index 81430f0f2..d333094a9 100644
--- a/src/services/enum-utilities.ts
+++ b/src/services/enum-utilities.ts
@@ -385,11 +385,6 @@ export default class EnumUtilities {
     return (effectOfOrder === EffectOfOrderTypes.PLAN_OF_ARRANGEMENT)
   }
 
-  /** Returns True if one or more of the POA have come into effect. */
-  static isArrangementComeIntoEffect (effectOfOrder: EffectOfOrderTypes): boolean {
-    return (effectOfOrder === EffectOfOrderTypes.ARRANGEMENT_EFFECT)
-  }
-
   //
   // Conversion helpers
   //
diff --git a/src/views/NoticeOfWithdrawal.vue b/src/views/NoticeOfWithdrawal.vue
index f6de5465a..e6e5abc90 100644
--- a/src/views/NoticeOfWithdrawal.vue
+++ b/src/views/NoticeOfWithdrawal.vue
@@ -81,6 +81,10 @@
             <RecordToBeWithdrawn
               class="mt-6"
               :filingToBeWithdrawn="filingToBeWithdrawn"
+              :hasDraftPartOfPoa="partOfPoa"
+              :hasDraftTakenEffect="hasTakenEffect"
+              @partOfPoa="partOfPoa=$event"
+              @hasTakenEffect="hasTakenEffect=$event"
             />
 
             <!-- Documents Delivery -->
@@ -136,29 +140,31 @@
               </div>
             </section>
 
-            <!-- Withdrawal of Arrangement Records -->
+            <!-- Court Order and Plan of Arrangement -->
             <section>
               <header>
                 <h2>Court Order and Plan of Arrangement</h2>
+                <p class="grey-text">
+                  If this filing is pursuant to a court order, enter the court order number. If this filing is pursuant
+                  to a plan of arrangement, enter the court order number and select Plan of Arrangement.
+                </p>
               </header>
               <div
-                id="poa-section"
-                :class="{ 'invalid-section': !poaValid && showErrors }"
-                class="pt-3"
+                id="court-order-section"
+                :class="{ 'invalid-section': !courtOrderValid && showErrors }"
               >
                 <v-card
                   flat
                   class="py-8 px-5"
                 >
-                  <PlanOfArrangement
+                  <CourtOrderPoa
                     :autoValidation="showErrors"
-                    :draftCourtOrderNumber="courtOrderNumber"
+                    :courtOrderNumberRequired="false"
+                    :draftCourtOrderNumber="fileNumber"
                     :hasDraftPlanOfArrangement="hasPlanOfArrangement"
-                    :hasDraftComeIntoEffect="hasComeIntoEffect"
-                    @courtNumber="courtOrderNumber=$event"
-                    @planOfArrangement="hasPlanOfArrangement=$event"
-                    @comeIntoEffect="hasComeIntoEffect=$event"
-                    @valid="poaValid=$event"
+                    @emitCourtNumber="fileNumber=$event"
+                    @emitPoa="hasPlanOfArrangement=$event"
+                    @emitValid="courtOrderValid=$event"
                   />
                 </v-card>
               </div>
@@ -179,7 +185,6 @@
                   class="py-8 px-5"
                 >
                   <StaffPayment
-                    class="py-8 px-6"
                     :staffPaymentData.sync="staffPaymentData"
                     @staffPaymentFormValid="staffPaymentValid=$event"
                   />
@@ -265,7 +270,7 @@
                 id="withdrawal-file-pay-btn"
                 color="primary"
                 large
-                :disabled="busySaving"
+                :disabled="busySaving || hasTakenEffect"
                 :loading="filingPaying"
                 @click="onClickSubmit()"
               >
@@ -288,7 +293,6 @@ import { StatusCodes } from 'http-status-codes'
 import { navigate } from '@/utils'
 import SbcFeeSummary from 'sbc-common-components/src/components/SbcFeeSummary.vue'
 import { Certify } from '@/components/common'
-import PlanOfArrangement from '@/components/NoticeOfWithdrawal/PlanOfArrangement.vue'
 import RecordToBeWithdrawn from '@/components/NoticeOfWithdrawal/RecordToBeWithdrawn.vue'
 import StaffPayment from '@/components/NoticeOfWithdrawal/StaffPayment.vue'
 import { ConfirmDialog, StaffRoleErrorDialog, PaymentErrorDialog, ResumeErrorDialog, SaveErrorDialog }
@@ -298,6 +302,7 @@ import { EnumUtilities, LegalServices } from '@/services/'
 import { EffectOfOrderTypes, FilingStatus, SaveErrorReasons } from '@/enums'
 import { FilingCodes, FilingTypes, StaffPaymentOptions } from '@bcrs-shared-components/enums'
 import { ConfirmDialogType, StaffPaymentIF } from '@/interfaces'
+import { CourtOrderPoa } from '@bcrs-shared-components/court-order-poa'
 import { DocumentDelivery } from '@bcrs-shared-components/document-delivery'
 import { useBusinessStore, useConfigurationStore, useRootStore } from '@/stores'
 
@@ -305,7 +310,7 @@ import { useBusinessStore, useConfigurationStore, useRootStore } from '@/stores'
     components: {
       Certify,
       ConfirmDialog,
-      PlanOfArrangement,
+      CourtOrderPoa,
       DocumentDelivery,
       StaffRoleErrorDialog,
       PaymentErrorDialog,
@@ -333,16 +338,19 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
     // enum for template
     readonly FilingCodes = FilingCodes
 
+    // variables for POA arrangement checkboxes
+    partOfPoa = false
+    hasTakenEffect = false
+
     // variables for Certify component
     certifiedBy = ''
     isCertified = false
     certifyFormValid = false
 
-    // variables for Court Order and POA component
-    poaValid = true
-    courtOrderNumber = ''
+    // variables for Court Order component
+    courtOrderValid = true
+    fileNumber = ''
     hasPlanOfArrangement = false
-    hasComeIntoEffect = false
 
     // variables for Document Delivery component
     documentDeliveryValid = true
@@ -363,7 +371,7 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
     dataLoaded = false
     loadingMessage = ''
     filingId = 0 // id of this Notice if Withdrawal filing
-    filingToBeWithdrawn = '' // id of filing to be withdrawn
+    filingToBeWithdrawn: number = null // id of filing to be withdrawn
     savedFiling: any = null // filing during save
     saving = false // true only when saving
     savingResuming = false // true only when saving and resuming
@@ -390,7 +398,7 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
       return (
         this.certifyFormValid &&
         this.documentDeliveryValid &&
-        this.poaValid &&
+        this.courtOrderValid &&
         this.staffPaymentValid
       )
     }
@@ -423,11 +431,11 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
       // this is the id of filing being withdrawn, and of THIS filing
       // if filingID is 0, this is a new filing
       // otherwise it's a draft filing
-      this.filingToBeWithdrawn = this.$route.query.filingToBeWithdrawn as string || ''
+      this.filingToBeWithdrawn = +this.$route.query.filingToBeWithdrawn
       this.filingId = +this.$route.query.filingId // number or NaN
 
       // if required data isn't set, go back to dashboard
-      if (isNaN(this.filingId)) {
+      if (isNaN(this.filingId) || isNaN(this.filingToBeWithdrawn)) {
         this.navigateToBusinessDashboard(this.getIdentifier)
       }
     }
@@ -476,7 +484,7 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
         if (!filing) throw new Error('Missing filing')
         if (!filing.header) throw new Error('Missing header')
         if (!filing.business) throw new Error('Missing business')
-        if (!filing.noticeOfWithdraw) throw new Error('Missing notice of withdraw object')
+        if (!filing.noticeOfWithdrawal) throw new Error('Missing notice of withdraw object')
         if (filing.header.name !== FilingTypes.NOTICE_OF_WITHDRAWAL) throw new Error('Invalid filing type')
         if (filing.header.status !== FilingStatus.DRAFT) throw new Error('Invalid filing status')
         if (filing.business.identifier !== this.getIdentifier) throw new Error('Invalid business identifier')
@@ -484,7 +492,6 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
 
         // load Certified By (but not Date)
         this.certifiedBy = filing.header.certifiedBy
-
         // load Staff Payment properties
         if (filing.header.routingSlipNumber) {
           this.staffPaymentData = {
@@ -510,12 +517,19 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
           } as StaffPaymentIF
         }
 
-        // load Court Order, POA and arrangement properties
-        const courtOrder = filing.noticeOfWithdraw.courtOrder
+        // load POA Effect properties
+        if (filing.noticeOfWithdrawal.partOfPoa) {
+          this.partOfPoa = true
+          if (filing.noticeOfWithdrawal.hasTakenEffect) {
+            this.hasTakenEffect = true
+          }
+        }
+
+        // load Court Order and POA properties
+        const courtOrder = filing.noticeOfWithdrawal.courtOrder
         if (courtOrder) {
-          this.courtOrderNumber = courtOrder.fileNumber
+          this.fileNumber = courtOrder.fileNumber
           this.hasPlanOfArrangement = EnumUtilities.isEffectOfOrderPlanOfArrangement(courtOrder.effectOfOrder)
-          this.hasComeIntoEffect = EnumUtilities.isArrangementComeIntoEffect(courtOrder.effectOfArrangement)
         }
 
         // load Documents Delivery
@@ -632,6 +646,9 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
       // prevent double saving
       if (this.busySaving) return
 
+      // prevent submit when POA is part of the filing and has taken effect
+      if (this.hasTakenEffect) return
+
       this.filingPaying = true
 
       // save final filing (not draft)
@@ -754,18 +771,18 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
 
       const data: any = {
         noticeOfWithdrawal: {
-          filingId: this.filingToBeWithdrawn
+          filingId: this.filingToBeWithdrawn,
+          partOfPoa: this.partOfPoa,
+          hasTakenEffect: this.hasTakenEffect
         }
       }
 
-      if (this.courtOrderNumber !== '') {
+      if (this.fileNumber !== '') {
         data.noticeOfWithdrawal.courtOrder = {
-          fileNumber: this.courtOrderNumber,
-          effectOfOrder: (this.hasPlanOfArrangement ? EffectOfOrderTypes.PLAN_OF_ARRANGEMENT : '') as string,
-          effectOfArrangement: (this.hasComeIntoEffect ? EffectOfOrderTypes.ARRANGEMENT_EFFECT : '') as string
+          fileNumber: this.fileNumber,
+          effectOfOrder: (this.hasPlanOfArrangement ? EffectOfOrderTypes.PLAN_OF_ARRANGEMENT : '') as string
         }
       }
-
       // build filing
       const filing = Object.assign({}, header, business, data)
       try {
@@ -882,7 +899,7 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
     readonly validComponents = [
       'document-delivery-section',
       'certify-form-section',
-      'poa-section',
+      'court-order-section',
       'staff-payment-section'
     ]
 
@@ -891,13 +908,13 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
       return {
         documentDelivery: this.documentDeliveryValid,
         certifyForm: this.certifyFormValid,
-        planOfArrangement: this.poaValid,
+        courtOrder: this.courtOrderValid,
         staffPayment: this.staffPaymentValid
       }
     }
 
     @Watch('certifyFormValid')
-    @Watch('poaValid')
+    @Watch('courtOrderValid')
     @Watch('documentDeliveryValid')
     @Watch('staffPaymentValid')
     onHaveChanges (): void {
@@ -982,7 +999,7 @@ export default class NoticeOfWithdrawal extends Mixins(CommonMixin, DateMixin, F
 
   // Fix font size and color to stay consistent.
   :deep() {
-    #document-delivery, #poa-label {
+    #document-delivery, #court-order-label, #poa-label {
       font-size: $px-14;
     }
 
diff --git a/tests/unit/NoticeOfWithdrawal.spec.ts b/tests/unit/NoticeOfWithdrawal.spec.ts
index de0a8e523..67e4d62d7 100644
--- a/tests/unit/NoticeOfWithdrawal.spec.ts
+++ b/tests/unit/NoticeOfWithdrawal.spec.ts
@@ -7,9 +7,10 @@ import NoticeOfWithdrawal from '@/views/NoticeOfWithdrawal.vue'
 import { ConfirmDialog, StaffRoleErrorDialog, PaymentErrorDialog, ResumeErrorDialog, SaveErrorDialog }
   from '@/components/dialogs'
 import { Certify } from '@/components/common'
+import { CourtOrderPoa } from '@bcrs-shared-components/court-order-poa'
 import { DocumentDelivery } from '@bcrs-shared-components/document-delivery'
+import { FilingCodes } from '@bcrs-shared-components/enums'
 import VueRouter from 'vue-router'
-import PlanOfArrangement from '@/components/NoticeOfWithdrawal/PlanOfArrangement.vue'
 import RecordToBeWithdrawn from '@/components/NoticeOfWithdrawal/RecordToBeWithdrawn.vue'
 import StaffPayment from '@/components/NoticeOfWithdrawal/StaffPayment.vue'
 
@@ -49,12 +50,12 @@ describe('Notice of Withdrawal view', () => {
     expect(wrapper.findComponent(ResumeErrorDialog).exists()).toBe(true)
     expect(wrapper.findComponent(StaffRoleErrorDialog).exists()).toBe(true)
     expect(wrapper.findComponent(SaveErrorDialog).exists()).toBe(true)
-    expect(wrapper.findComponent(PlanOfArrangement).exists()).toBe(true)
+    expect(wrapper.findComponent(CourtOrderPoa).exists()).toBe(true)
     expect(wrapper.findComponent(RecordToBeWithdrawn).exists()).toBe(true)
     expect(wrapper.findComponent(StaffPayment).exists()).toBe(true)
 
     // Verify $route params and query
-    expect(wrapper.vm.filingToBeWithdrawn).toBe('12345')
+    expect(wrapper.vm.filingToBeWithdrawn).toBe(12345)
     expect(wrapper.vm.filingId).toBe(0)
 
     wrapper.destroy()
@@ -77,7 +78,7 @@ describe('Notice of Withdrawal view', () => {
     expect(vm.filingData).not.toBeUndefined()
     expect(vm.filingData).not.toBeNull()
     expect(vm.filingData.length).toBe(1)
-    expect(vm.filingData[0].filingTypeCode).toBe('NOIWD')
+    expect(vm.filingData[0].filingTypeCode).toBe(FilingCodes.NOTICE_OF_WITHDRAWAL)
 
     wrapper.destroy()
   })
@@ -93,35 +94,35 @@ describe('Notice of Withdrawal view', () => {
     vm.certifyFormValid = true
     vm.documentDeliveryValid = true
     vm.staffPaymentValid = true
-    vm.poaValid = true
+    vm.courtOrderValid = true
     expect(vm.isPageValid).toBe(true)
 
     // verify "validated" - invalid Certify form
     vm.certifyFormValid = false
     vm.documentDeliveryValid = true
     vm.staffPaymentValid = true
-    vm.poaValid = true
+    vm.courtOrderValid = true
     expect(vm.isPageValid).toBe(false)
 
     // verify "validated" - invalid Document Delivery form
     vm.certifyFormValid = true
     vm.documentDeliveryValid = false
     vm.staffPaymentValid = true
-    vm.poaValid = true
+    vm.courtOrderValid = true
     expect(vm.isPageValid).toBe(false)
 
     // verify "validated" - invalid Staff Payment form
     vm.certifyFormValid = true
     vm.documentDeliveryValid = true
     vm.staffPaymentValid = false
-    vm.poaValid = true
+    vm.courtOrderValid = true
     expect(vm.isPageValid).toBe(false)
 
-    // verify "validated" - invalid POA section
+    // verify "validated" - invalid Court Order section
     vm.certifyFormValid = true
     vm.documentDeliveryValid = true
     vm.staffPaymentValid = true
-    vm.poaValid = false
+    vm.courtOrderValid = false
     expect(vm.isPageValid).toBe(false)
 
     wrapper.destroy()