diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_poc_form_agree.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_poc_form_agree.svelte
index 272ab398..6691fbcb 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_session_poc_form_agree.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_session_poc_form_agree.svelte
@@ -22,7 +22,9 @@ let ae_promises: key_val = {};
 
 let poc_type = $events_loc.pres_mgmt.label__session_poc_type ?? 'poc';
 
-$events_sess.pres_mgmt.disable_submit__opt_out = false;
+$events_sess.pres_mgmt.disable__session_submit_opt_out = false;
+$events_sess.pres_mgmt.status__session_opt_out = null;
+$events_sess.pres_mgmt.status__session_agree = null;
 
 let tmp_agree = false;
 let tmp_opt_out: key_val = {
@@ -36,8 +38,8 @@ let tmp_opt_out: key_val = {
 async function handle_submit_form(event) {
     console.log('*** handle_submit_form() ***');
 
-    $events_sess.pres_mgmt.disable_submit__opt_out = true;
-    $events_sess.pres_mgmt.submit_status = 'saving';
+    $events_sess.pres_mgmt.disable__session_submit_opt_out = true;
+    $events_sess.pres_mgmt.status__session_opt_out = 'saving';
 
     // Data in
     let form_data = new FormData(event.target);
@@ -83,12 +85,12 @@ async function handle_submit_form(event) {
     //     }
     // }
 
-    // ae_promises.update__event_presenter_obj = await handle_update__event_presenter({
+    // ae_promises.update__event_session_obj__opt_out = await handle_update__event_presenter({
     //     obj_type: 'event_presenter',
     //     obj_id: $lq__event_session_obj?.event_presenter_id_random,
     //     data: data_out
     // });
-    // console.log(ae_promises.update__event_presenter_obj);
+    // console.log(ae_promises.update__event_session_obj__opt_out);
 
 
 
@@ -101,7 +103,7 @@ async function handle_submit_form(event) {
     // console.log('event_session_data:', event_session_data);
     // event_session_data.poc_kv_json[poc_type]['agree'] = false;
 
-    ae_promises.update__event_session_obj = events_func.update_ae_obj__event_session({
+    ae_promises.update__event_session_obj__opt_out = events_func.update_ae_obj__event_session({
         api_cfg: $ae_api,
         event_session_id: $lq__event_session_obj?.event_session_id_random,
         data_kv: event_session_data,
@@ -112,10 +114,8 @@ async function handle_submit_form(event) {
         // return update_result;
     });
 
-
-
-    $events_sess.pres_mgmt.disable_submit__opt_out = false;
-    $events_sess.pres_mgmt.submit_status = 'saved';
+    $events_sess.pres_mgmt.disable__session_submit_opt_out = false;
+    $events_sess.pres_mgmt.status__session_opt_out = 'saved';
 }
 
 </script>
@@ -225,25 +225,25 @@ async function handle_submit_form(event) {
         <div class="text-center w-full">
         <button
             type="submit"
-            disabled={($events_sess.pres_mgmt?.disable_submit__opt_out)}
+            disabled={($events_sess.pres_mgmt?.disable__session_submit_opt_out)}
             on:click={() => {
                 console.log('*** Save button clicked ***');
             }}
             class="btn btn-md variant-ghost-warning hover:variant-filled-secondary m-2"
             >
+
             <span class="fas fa-check mx-1"></span>
             Save Opt-Out?
 
-            {#await ae_promises.update__event_presenter_obj}
+            {#await ae_promises.update__event_session_obj__opt_out}
                 <div class="modal-loading">
                     <span class="fas fa-spinner fa-spin"></span>
                     <span class="loading-text">
-                        <!-- <ProgressRadial value={undefined} /> -->
                         Saving...
                     </span>
                 </div>
-            {:then update__event_presenter_obj_result}
-                {#if update__event_presenter_obj_result}
+            {:then update__event_session_obj__opt_out_result}
+                {#if $events_sess.pres_mgmt.status__session_opt_out}
                 <div class="modal-loading">
                     <span class="fas fa-check-circle"></span>
                     <span class="loading-text">Successfully saved!</span>
@@ -270,6 +270,8 @@ async function handle_submit_form(event) {
             on:click={() => {
                 console.log('Agree to the terms and conditions.');
 
+                $events_sess.pres_mgmt.status__session_agree = 'saving';
+
                 let event_session_data = {
                     poc_agree: true,
                 }
@@ -279,7 +281,7 @@ async function handle_submit_form(event) {
                 // console.log('event_session_data:', event_session_data);
                 // event_session_data.poc_kv_json[poc_type]['agree'] = true;
 
-                ae_promises.update__event_session_obj = events_func.update_ae_obj__event_session({
+                ae_promises.update__event_session_obj__agree = events_func.update_ae_obj__event_session({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random,
                     data_kv: event_session_data,
@@ -290,11 +292,35 @@ async function handle_submit_form(event) {
                     // return update_result;
                 });
 
+                $events_sess.pres_mgmt.status__session_agree = 'saved';
             }}
             class="btn btn-lg variant-ghost-warning hover:variant-filled-success m-2"
             >
+
             <span class="fa fa-check m-1 text-green-500"></span>
             Mark as agreed?
+
+            {#await ae_promises.update__event_session_obj__agree}
+                <div class="modal-loading">
+                    <span class="fas fa-spinner fa-spin"></span>
+                    <span class="loading-text">
+                        Saving...
+                    </span>
+                </div>
+            {:then update__event_session_obj__agree_result}
+                {#if $events_sess.pres_mgmt.status__session_agree}
+                <div class="modal-loading">
+                    <span class="fas fa-check-circle"></span>
+                    <span class="loading-text">Successfully saved!</span>
+                </div>
+                {/if}
+            {:catch error}
+                <div class="modal-loading">
+                    <span class="fas fa-exclamation-triangle"></span>
+                    <span class="loading-text">Error: {error.message}</span>
+                </div>
+            {/await}
+
         </button>
     {:else}
         <button
@@ -310,7 +336,7 @@ async function handle_submit_form(event) {
                 // console.log('event_session_data:', event_session_data);
                 // event_session_data.poc_kv_json[poc_type]['agree'] = false;
 
-                ae_promises.update__event_session_obj = events_func.update_ae_obj__event_session({
+                ae_promises.update__event_session_obj__agree = events_func.update_ae_obj__event_session({
                     api_cfg: $ae_api,
                     event_session_id: $lq__event_session_obj?.event_session_id_random,
                     data_kv: event_session_data,
@@ -326,6 +352,27 @@ async function handle_submit_form(event) {
             >
             <span class="fas fa-times text-red-500 m-1"></span>
             Change to not agreed?
+
+            {#await ae_promises.update__event_session_obj__agree}
+                <div class="modal-loading">
+                    <span class="fas fa-spinner fa-spin"></span>
+                    <span class="loading-text">
+                        Saving...
+                    </span>
+                </div>
+            {:then update__event_session_obj__agree_result}
+                {#if $events_sess.pres_mgmt.status__session_agree}
+                <div class="modal-loading">
+                    <span class="fas fa-check-circle"></span>
+                    <span class="loading-text">Successfully saved!</span>
+                </div>
+                {/if}
+            {:catch error}
+                <div class="modal-loading">
+                    <span class="fas fa-exclamation-triangle"></span>
+                    <span class="loading-text">Error: {error.message}</span>
+                </div>
+            {/await}
         </button>
     {/if}
     </div>