diff --git a/index.js b/index.js
index 8fab01d..1b89a8a 100644
--- a/index.js
+++ b/index.js
@@ -1991,7 +1991,7 @@ async function generate(settings){
     
 
   }
-  psapi.reSelectMarqueeExe(g_selection)
+  await psapi.reSelectMarqueeExe(g_selection)
   //update the viewer
   await loadViewerImages()
 
@@ -2057,6 +2057,7 @@ Array.from(document.getElementsByClassName('btnGenerateClass')).forEach(btn =>{
   btn.addEventListener('click', async ()=>{
     // const settings = await getSettings()
     // generate(settings)
+    await 
     easyModeGenerate()
   })
   
@@ -2095,10 +2096,10 @@ document
       const isSelectionAreaValid = await psapi.checkIfSelectionAreaIsActive()
       if(isSelectionAreaValid){
       const validSelection = isSelectionAreaValid
-      psapi.layerToSelection(validSelection)
+      await psapi.layerToSelection(validSelection)
 
     }else{
-      psapi.promptForMarqueeTool()
+      await psapi.promptForMarqueeTool()
     }
     
   }catch(e)
@@ -2132,7 +2133,7 @@ document
       const image_name = await psapi.setInitImageMask(layer, random_session_id)
       const path = `./server/python_server/init_images/${image_name}`
       g_viewer_manager.addMaskLayers(layer,path,false)//can be autodeleted?
-      psapi.unselectActiveLayersExe()
+      await psapi.unselectActiveLayersExe()
     }catch(e){
       console.warn(e)
     }
@@ -2142,12 +2143,12 @@ document
   
 document.getElementById('bSetInitImage').addEventListener('click', async ()=>  {
   const layer = await app.activeDocument.activeLayers[0]
-  psapi.setInitImage(layer, random_session_id)
+  await psapi.setInitImage(layer, random_session_id)
 })
 
 document.getElementById('bSetInitImageMask').addEventListener('click', async ()=>  {
   const layer = await app.activeDocument.activeLayers[0]
-  psapi.setInitImageMask(layer, random_session_id)
+  await psapi.setInitImageMask(layer, random_session_id)
 })
 function moveElementToAnotherTab(elementId, newParentId){
   const element = document.getElementById(elementId)
@@ -2385,6 +2386,9 @@ async function convertToSmartObjectExe () {
 }
 
 async function ImagesToLayersExe (images_paths) {
+  g_generation_session.isLoadingActive = true
+  
+  await psapi.reSelectMarqueeExe(g_selection)
   image_path_to_layer = {}
   console.log("ImagesToLayersExe: images_paths: ",images_paths)
   for (image_path of images_paths) {
@@ -2613,7 +2617,7 @@ async function NewViewerImageClickHandler(img,viewer_obj_owner){
         // selectedViewerImageObj.select(true) 
         // viewer_obj_owner.state = viewer.ViewerObjState['Unlink']
         viewer_obj_owner.visible(true)
-        viewer_obj_owner.select(true)
+        await viewer_obj_owner.select(true)
         viewer_obj_owner.active(true)
         // console.log("viewer_obj_owner.path: ",viewer_obj_owner.path)
         // console.log("viewer_obj_owner.info(): ")
diff --git a/manifest.json b/manifest.json
index b0ad924..a21cc93 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "auto.photoshop.stable.diffusion.plugin",
   "name": "Auto Photoshop Stable Diffusion Plugin",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "host": [
     {
       "app": "PS",
diff --git a/outpaint.js b/outpaint.js
index df45dd6..b0c8ebf 100644
--- a/outpaint.js
+++ b/outpaint.js
@@ -562,7 +562,7 @@ async function outpaintFasterExe(session_id){
             // //set initial image
             // //set mask image
             
-            psapi.selectLayers([maskGroup])
+            await psapi.selectLayers([maskGroup])
             inpaintLayers = [maskGroup,white_mark_layer,blackSolidLayer,snapshotGroup,snapshotLayer,whiteSolidLayer]
             // g_mask_related_layers['mask_group'] = maskGroup
             // g_mask_related_layers['white_mark'] = white_mark_layer
diff --git a/utility/session.js b/utility/session.js
index 287f92b..02352c5 100644
--- a/utility/session.js
+++ b/utility/session.js
@@ -90,7 +90,7 @@ class GenerationSession{
         }
         
         //delete the old selection area
-        g_selection = {}
+        // g_selection = {}
         
         this.isFirstGeneration = true // only before the first generation is requested should this be true
         
diff --git a/viewer.js b/viewer.js
index a3454c9..31fd3ea 100644
--- a/viewer.js
+++ b/viewer.js
@@ -171,10 +171,10 @@ class OutputImage extends ViewerImage {
       console.warn(e)
     }
   }
-  select () {
+  async select () {
     super.select()
     if (this.isLayerValid()) {
-      psapi.selectLayersExe([this.layer])
+      await psapi.selectLayersExe([this.layer])
       //   console.log(`${this.layer.id} got selected`);
     }
   }
@@ -268,7 +268,7 @@ class InitImage extends ViewerImage {
     }
   }
 
-  select () {
+  async select () {
     super.select()
 
     const selectLayers = []
@@ -284,7 +284,7 @@ class InitImage extends ViewerImage {
     //   selectLayers.push(this.solid_layer)
     // }
 
-    psapi.selectLayersExe(selectLayers)
+    await psapi.selectLayersExe(selectLayers)
     //   console.log(`${this.layer.id} got selected`);
   }
 
@@ -374,7 +374,7 @@ class InitMaskImage extends ViewerImage {
       }
     }
   
-    select () {
+    async select () {
       super.select()
   
       const selectLayers = []
@@ -390,7 +390,7 @@ class InitMaskImage extends ViewerImage {
       //   selectLayers.push(this.solid_layer)
       // }
   
-      psapi.selectLayersExe(selectLayers)
+      await psapi.selectLayersExe(selectLayers)
       //   console.log(`${this.layer.id} got selected`);
     }