diff --git a/app/build.gradle b/app/build.gradle
index 76fc43a..d042d5d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdk minApi
         targetSdk targetApi
         versionCode 20
-        versionName "v2.9.4-newyorkcheesecake"
+        versionName "v2.9.4-oatmealcookie"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
diff --git a/app/src/main/java/com/vectras/vm/AppConfig.java b/app/src/main/java/com/vectras/vm/AppConfig.java
index e99bc67..c07b254 100644
--- a/app/src/main/java/com/vectras/vm/AppConfig.java
+++ b/app/src/main/java/com/vectras/vm/AppConfig.java
@@ -69,6 +69,7 @@ public class AppConfig {
     //public static String maindirpath = FileUtils.getExternalFilesDirectory(SplashActivity.activity).getPath() + "/";
     public static String sharedFolder = maindirpath + "SharedFolder/";
     public static String downloadsFolder = maindirpath + "Downloads/";
-    public static String romsdatajson = Environment.getExternalStorageDirectory().toString() + "/Documents/VectrasVM/roms-data.json";
+    public static String romsdatajson = maindirpath + "roms-data.json";
+    public static String vmFolder = maindirpath + "roms/";
 
 }
diff --git a/app/src/main/java/com/vectras/vm/CqcmActivity.java b/app/src/main/java/com/vectras/vm/CqcmActivity.java
index 671a21b..fc53398 100644
--- a/app/src/main/java/com/vectras/vm/CqcmActivity.java
+++ b/app/src/main/java/com/vectras/vm/CqcmActivity.java
@@ -23,7 +23,7 @@ public class CqcmActivity extends AppCompatActivity {
     private String contentJson = "";
     private String contentJsonNow = "";
     private Button buttonallow;
-    private String vmID = VMManager.ramdomVMID();
+    private String vmID = VMManager.idGenerator();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/vectras/vm/CustomRomActivity.java b/app/src/main/java/com/vectras/vm/CustomRomActivity.java
index ebe0e86..b74525f 100644
--- a/app/src/main/java/com/vectras/vm/CustomRomActivity.java
+++ b/app/src/main/java/com/vectras/vm/CustomRomActivity.java
@@ -94,9 +94,8 @@ public class CustomRomActivity extends AppCompatActivity {
     public String previousName = "";
     public String secondVMdirectory = "";
     public boolean addromnowdone = false;
-    public String vmID = VMManager.ramdomVMID();
+    public String vmID = VMManager.idGenerator();
     private boolean created = false;
-    private boolean importedCVBI = false;
 
     public ProgressBar loadingPb;
 
@@ -340,22 +339,36 @@ public class CustomRomActivity extends AppCompatActivity {
                 if (title.getText().toString().isEmpty()) {
                     VectrasApp.oneDialog(getResources().getString(R.string.oops), getResources().getString(R.string.need_set_name),true, false, activity);
                 } else if ((!drive.getText().toString().isEmpty()) || (!cdrom.getText().toString().isEmpty())) {
-                    startCreateNewVM();
+                    checkJsonFile();
                 } else {
                     if (VectrasApp.isHaveADisk(qemu.getText().toString())) {
-                        startCreateNewVM();
+                        checkJsonFile();
                     } else {
-                        AlertDialog alertDialog = new AlertDialog.Builder(activity, R.style.MainDialogTheme).create();
-                        alertDialog.setTitle(getResources().getString(R.string.problem_has_been_detected));
-                        alertDialog.setMessage(getResources().getString(R.string.you_have_not_added_any_storage_devices));
-                        alertDialog.setCancelable(true);
-                        alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, getResources().getString(R.string.continuetext), (dialog, which) -> {
-                            startCreateNewVM();
-                        });
-                        alertDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getResources().getString(R.string.cancel), (dialog, which) -> {
+                        if (qemu.getText().toString().isEmpty()) {
+                            AlertDialog alertDialog = new AlertDialog.Builder(activity, R.style.MainDialogTheme).create();
+                            alertDialog.setTitle(getResources().getString(R.string.problem_has_been_detected));
+                            alertDialog.setMessage(getResources().getString(R.string.qemu_params_is_empty));
+                            alertDialog.setCancelable(true);
+                            alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, getResources().getString(R.string.continuetext), (dialog, which) -> {
+                                checkJsonFile();
+                            });
+                            alertDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getResources().getString(R.string.cancel), (dialog, which) -> {
 
-                        });
-                        alertDialog.show();
+                            });
+                            alertDialog.show();
+                        } else {
+                            AlertDialog alertDialog = new AlertDialog.Builder(activity, R.style.MainDialogTheme).create();
+                            alertDialog.setTitle(getResources().getString(R.string.problem_has_been_detected));
+                            alertDialog.setMessage(getResources().getString(R.string.you_have_not_added_any_storage_devices));
+                            alertDialog.setCancelable(true);
+                            alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, getResources().getString(R.string.continuetext), (dialog, which) -> {
+                                checkJsonFile();
+                            });
+                            alertDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getResources().getString(R.string.cancel), (dialog, which) -> {
+
+                            });
+                            alertDialog.show();
+                        }
                     }
                 }
             }
@@ -449,7 +462,7 @@ public class CustomRomActivity extends AppCompatActivity {
             vmID = getIntent().getStringExtra("VMID");
 
             if (vmID.isEmpty()) {
-                vmID = VMManager.ramdomVMID();
+                vmID = VMManager.idGenerator();
             }
 
             //Pattern pattern = Pattern.compile(cdromPatternCompile());
@@ -542,10 +555,8 @@ public class CustomRomActivity extends AppCompatActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent ReturnedIntent) {
         super.onActivityResult(requestCode, resultCode, ReturnedIntent);
 
-        if (title.getText().toString().length() > 0) {
-            File romDir = new File(AppConfig.maindirpath + "roms/" + title.getText().toString());
-            romDir.mkdirs();
-        }
+        File romDir = new File(AppConfig.vmFolder + vmID);
+        romDir.mkdirs();
 
         LinearLayout custom = findViewById(R.id.custom);
         if (requestCode == 1001 && resultCode == RESULT_OK) {
@@ -575,13 +586,13 @@ public class CustomRomActivity extends AppCompatActivity {
                     } finally {
                         try {
                             try {
-                                SaveImage(selectedImage, new File(AppConfig.maindirpath + "roms/" + vmID), vmID + "-" + selectedFilePath.getName());
+                                SaveImage(selectedImage, new File(AppConfig.vmFolder + vmID), vmID + "-" + selectedFilePath.getName());
                             } finally {
                                 Runnable runnable = new Runnable() {
                                     @Override
                                     public void run() {
                                         loadingPb.setVisibility(View.GONE);
-                                        icon.setText(AppConfig.maindirpath + "roms/" + vmID + "/" + vmID + "-" + selectedFilePath.getName());
+                                        icon.setText(AppConfig.vmFolder + vmID + "/" + vmID + "-" + selectedFilePath.getName());
                                     }
                                 };
                                 activity.runOnUiThread(runnable);
@@ -607,7 +618,7 @@ public class CustomRomActivity extends AppCompatActivity {
             Uri content_describer = ReturnedIntent.getData();
             File selectedFilePath = new File(getPath(content_describer));
             if (selectedFilePath.getName().endsWith(".iso")) {
-                String cdromPath = AppConfig.maindirpath + "roms/" + vmID + "/" + selectedFilePath.getName();
+                String cdromPath = AppConfig.vmFolder + vmID + "/" + selectedFilePath.getName();
                 cdrom.setText(cdromPath);
 
                 //String qemuText = qemu.getText().toString();
@@ -648,7 +659,7 @@ public class CustomRomActivity extends AppCompatActivity {
                         }
                         try {
                             try {
-                                OutputStream out = new FileOutputStream(new File(AppConfig.maindirpath + "roms/" + vmID + "/" + selectedFilePath.getName()));
+                                OutputStream out = new FileOutputStream(new File(AppConfig.vmFolder + vmID + "/" + selectedFilePath.getName()));
                                 try {
                                     // Transfer bytes from in to out
                                     byte[] buf = new byte[1024];
@@ -712,7 +723,7 @@ public class CustomRomActivity extends AppCompatActivity {
         }
     }
 
-    private void errorjsondialog() {
+    private void checkJsonFile() {
         if (isFileExists(AppConfig.romsdatajson)) {
             if (!VectrasApp.checkJSONIsNormal(AppConfig.romsdatajson)) {
                 alertDialog = new AlertDialog.Builder(activity, R.style.MainDialogTheme).create();
@@ -726,10 +737,13 @@ public class CustomRomActivity extends AppCompatActivity {
 
                 });
                 alertDialog.show();
+            } else {
+                startCreateNewVM();
             }
 
         } else {
-
+            VectrasApp.writeToFile(AppConfig.maindirpath, "roms-data.json", "[]");
+            startCreateNewVM();
         }
     }
 
@@ -761,7 +775,7 @@ public class CustomRomActivity extends AppCompatActivity {
     }
 
     private void startCreateVM() {
-        errorjsondialog();
+        //errorjsondialog();
 
         File isoFile = new File(cdrom.getText().toString());
         if (isoFile.exists() && !qemu.getText().toString().contains(cdrom.getText().toString())) {
@@ -771,7 +785,7 @@ public class CustomRomActivity extends AppCompatActivity {
         if (modify) {
 
             int position = getIntent().getIntExtra("POS", 0);
-            final File jsonFile = new File(AppConfig.maindirpath + "roms-data" + ".json");
+            final File jsonFile = new File(AppConfig.romsdatajson);
             current.itemDrv1 = drive.getText().toString();
             current.itemExtra = qemu.getText().toString();
             try {
@@ -804,7 +818,7 @@ public class CustomRomActivity extends AppCompatActivity {
             editor.putBoolean("isFirstLaunch", Boolean.TRUE);
             editor.apply();
             loadingPb.setVisibility(View.VISIBLE);
-            final File jsonFile = new File(AppConfig.maindirpath + "roms-data" + ".json");
+            final File jsonFile = new File(AppConfig.romsdatajson);
             RomsJso obj = new RomsJso();
             if (jsonFile.exists()) {
                 try {
@@ -867,18 +881,18 @@ public class CustomRomActivity extends AppCompatActivity {
             //activity.startActivity(new Intent(activity, SplashActivity.class));
         }
         if (!previousName.isEmpty() && !title.getText().toString().equals(previousName)) {
-            if (VectrasApp.isFileExists(AppConfig.maindirpath + "roms/" + previousName + "/vmID.txt")) {
-                VectrasApp.copyAFile(AppConfig.maindirpath + "roms/" + previousName + "/vmID.txt", AppConfig.maindirpath + "roms/" + vmID + "/vmID.txt");
+            if (VectrasApp.isFileExists(AppConfig.vmFolder + previousName + "/vmID.txt")) {
+                VectrasApp.copyAFile(AppConfig.vmFolder + previousName + "/vmID.txt", AppConfig.vmFolder + vmID + "/vmID.txt");
             } else {
-                VectrasApp.writeToFile(AppConfig.maindirpath + "roms/" + title.getText().toString(), "/vmID.txt", VMManager.ramdomVMID());
-                VectrasApp.copyAFile(AppConfig.maindirpath + "roms/" + vmID + "/vmID.txt", AppConfig.maindirpath + previousName + "/vmID.txt");
+                VectrasApp.writeToFile(AppConfig.vmFolder + title.getText().toString(), "/vmID.txt", VMManager.idGenerator());
+                VectrasApp.copyAFile(AppConfig.vmFolder + vmID + "/vmID.txt", AppConfig.vmFolder + previousName + "/vmID.txt");
             }
         } else {
-            VectrasApp.writeToFile(AppConfig.maindirpath + "roms/" + title.getText().toString(), "/vmID.txt", VMManager.ramdomVMID());
+            VectrasApp.writeToFile(AppConfig.vmFolder + title.getText().toString(), "/vmID.txt", VMManager.idGenerator());
         }
-        if ((!secondVMdirectory.isEmpty()) && VectrasApp.isFileExists(AppConfig.maindirpath + "roms/" + vmID + "/vmID.txt")) {
-            if (!(AppConfig.maindirpath + "roms/" + title.getText().toString()).equals(secondVMdirectory)) {
-                VectrasApp.copyAFile(AppConfig.maindirpath + "roms/" + vmID + "/vmID.txt", secondVMdirectory + "/vmID.txt");
+        if ((!secondVMdirectory.isEmpty()) && VectrasApp.isFileExists(AppConfig.vmFolder + vmID + "/vmID.txt")) {
+            if (!(AppConfig.vmFolder + title.getText().toString()).equals(secondVMdirectory)) {
+                VectrasApp.copyAFile(AppConfig.vmFolder + vmID + "/vmID.txt", secondVMdirectory + "/vmID.txt");
             }
        }
     }
@@ -887,7 +901,7 @@ public class CustomRomActivity extends AppCompatActivity {
         if (modify) {
             VMManager.editVM(Objects.requireNonNull(title.getText()).toString(), Objects.requireNonNull(icon.getText()).toString(), Objects.requireNonNull(drive.getText()).toString(), MainSettingsManager.getArch(activity), Objects.requireNonNull(cdrom.getText()).toString(), Objects.requireNonNull(qemu.getText()).toString(), getIntent().getIntExtra("POS", 0));
         } else {
-            VMManager.createNewVM(Objects.requireNonNull(title.getText()).toString(), Objects.requireNonNull(icon.getText()).toString(), Objects.requireNonNull(drive.getText()).toString(), MainSettingsManager.getArch(activity), Objects.requireNonNull(cdrom.getText()).toString(), Objects.requireNonNull(qemu.getText()).toString(), vmID, importedCVBI);
+            VMManager.createNewVM(Objects.requireNonNull(title.getText()).toString(), Objects.requireNonNull(icon.getText()).toString(), Objects.requireNonNull(drive.getText()).toString(), MainSettingsManager.getArch(activity), Objects.requireNonNull(cdrom.getText()).toString(), Objects.requireNonNull(qemu.getText()).toString(), vmID);
         }
 
         created = true;
@@ -896,6 +910,7 @@ public class CustomRomActivity extends AppCompatActivity {
             RomsManagerActivity.isFinishNow = true;
         }
 
+        modify = false;
         finish();
     }
 
@@ -956,7 +971,7 @@ public class CustomRomActivity extends AppCompatActivity {
                     FileInputStream zipFile = null;
                     try {
                         zipFile = (FileInputStream) getContentResolver().openInputStream((Uri.fromFile(new File(_filepath))));
-                        File targetDirectory = new File(AppConfig.maindirpath + "roms/" + vmID);
+                        File targetDirectory = new File(AppConfig.vmFolder + vmID);
                         ZipInputStream zis = null;
                         zis = new ZipInputStream(
                                 new BufferedInputStream(zipFile));
@@ -998,8 +1013,8 @@ public class CustomRomActivity extends AppCompatActivity {
                                     custom.setVisibility(View.VISIBLE);
                                     ivIcon.setEnabled(true);
                                     try {
-                                        if (!VectrasApp.isFileExists(AppConfig.maindirpath + "roms/" + vmID + "/rom-data.json")) {
-                                            String _getDiskFile = VectrasApp.quickScanDiskFileInFolder(AppConfig.maindirpath + "roms/" + vmID);
+                                        if (!VectrasApp.isFileExists(AppConfig.vmFolder + vmID + "/rom-data.json")) {
+                                            String _getDiskFile = VectrasApp.quickScanDiskFileInFolder(AppConfig.vmFolder + vmID);
                                             if (!_getDiskFile.isEmpty()) {
                                                 //Error code: CR_CVBI2
                                                 if (getIntent().hasExtra("addromnow") && !addromnowdone) {
@@ -1034,7 +1049,6 @@ public class CustomRomActivity extends AppCompatActivity {
                                                     drive.setText(_getDiskFile);
                                                 }
                                                 VectrasApp.oneDialog(getResources().getString(R.string.oops), getResources().getString(R.string.error_CR_CVBI2), true, false, CustomRomActivity.this);
-                                                importedCVBI = true;
                                             } else {
                                                 //Error code: CR_CVBI3
                                                 if (getIntent().hasExtra("addromnow")) {
@@ -1042,36 +1056,35 @@ public class CustomRomActivity extends AppCompatActivity {
                                                 } else {
                                                     VectrasApp.oneDialog(getResources().getString(R.string.oops), getResources().getString(R.string.error_CR_CVBI3), true, false, CustomRomActivity.this);
                                                 }
-                                                importedCVBI = false;
                                             }
                                             return;
                                         }
 
-                                        JSONObject jObj = new JSONObject(FileUtils.readFromFile(MainActivity.activity, new File(AppConfig.maindirpath
-                                                + "roms/" + vmID + "/rom-data.json")));
+                                        JSONObject jObj = new JSONObject(FileUtils.readFromFile(MainActivity.activity, new File(AppConfig.vmFolder
+                                                + vmID + "/rom-data.json")));
 
                                         title.setText(jObj.getString("title"));
-                                        icon.setText(AppConfig.maindirpath
-                                                + "roms/" + vmID + "/" + jObj.getString("icon"));
+                                        icon.setText(AppConfig.vmFolder
+                                                + vmID + "/" + jObj.getString("icon"));
                                         if (!jObj.getString("drive").isEmpty()) {
-                                            drive.setText(AppConfig.maindirpath
-                                                    + "roms/" + vmID + "/" + jObj.getString("drive"));
+                                            drive.setText(AppConfig.vmFolder
+                                                    + vmID + "/" + jObj.getString("drive"));
                                         }
                                         qemu.setText(jObj.getString("qemu"));
                                         ImageView ivIcon = findViewById(R.id.ivIcon);
-                                        Bitmap bmImg = BitmapFactory.decodeFile(AppConfig.maindirpath
-                                                + "roms/" + vmID + "/" + jObj.getString("icon"));
+                                        Bitmap bmImg = BitmapFactory.decodeFile(AppConfig.vmFolder
+                                                + vmID + "/" + jObj.getString("icon"));
                                         ivIcon.setImageBitmap(bmImg);
                                         try {
                                             if (!jObj.getString("cdrom").isEmpty()) {
-                                                drive.setText(AppConfig.maindirpath
-                                                        + "roms/" + vmID + "/" + jObj.getString("cdrom"));
+                                                drive.setText(AppConfig.vmFolder
+                                                        + vmID + "/" + jObj.getString("cdrom"));
                                             }
                                         } catch (Exception _e) {
 
                                         }
 
-                                        VectrasApp.moveAFile(AppConfig.maindirpath + "roms/" + _filename.replace(".cvbi", ""), AppConfig.maindirpath + "roms/" + vmID);
+                                        VectrasApp.moveAFile(AppConfig.vmFolder + _filename.replace(".cvbi", ""), AppConfig.vmFolder + vmID);
                                         UIUtils.UIAlert(activity, getResources().getString(R.string.from) + ": " + jObj.getString("author"), getResources().getString(R.string.description) + ":\n\n" + Html.fromHtml(jObj.getString("desc")));
                                     } catch (JSONException e) {
                                         throw new RuntimeException(e);
@@ -1126,7 +1139,7 @@ public class CustomRomActivity extends AppCompatActivity {
     private void startProcessingHardDriveFile (Uri _content_describer) {
         LinearLayout custom = findViewById(R.id.custom);
         File selectedFilePath = new File(getPath(_content_describer));
-        drive.setText(AppConfig.maindirpath + "roms/" + vmID + "/" + selectedFilePath.getName());
+        drive.setText(AppConfig.vmFolder + vmID + "/" + selectedFilePath.getName());
         loadingPb.setVisibility(View.VISIBLE);
         custom.setVisibility(View.GONE);
         new Thread(new Runnable() {
@@ -1140,7 +1153,7 @@ public class CustomRomActivity extends AppCompatActivity {
                 }
                 try {
                     try {
-                        OutputStream out = new FileOutputStream(new File(AppConfig.maindirpath + "roms/" + vmID + "/" + selectedFilePath.getName()));
+                        OutputStream out = new FileOutputStream(new File(AppConfig.vmFolder + vmID + "/" + selectedFilePath.getName()));
                         try {
                             // Transfer bytes from in to out
                             byte[] buf = new byte[1024];
@@ -1203,14 +1216,16 @@ public class CustomRomActivity extends AppCompatActivity {
     public void onBackPressed() {
         super.onBackPressed();
         if (!created && !modify) {
-            VectrasApp.deleteDirectory(AppConfig.maindirpath + "roms/" + vmID);
+            VectrasApp.deleteDirectory(AppConfig.vmFolder + vmID);
         }
+        modify = false;
     }
 
     public void onDestroy() {
         if (!created && !modify) {
-            VectrasApp.deleteDirectory(AppConfig.maindirpath + "roms/" + vmID);
+            VectrasApp.deleteDirectory(AppConfig.vmFolder + vmID);
         }
+        modify = false;
         super.onDestroy();
     }
 }
diff --git a/app/src/main/java/com/vectras/vm/VMManager.java b/app/src/main/java/com/vectras/vm/VMManager.java
index d794d10..0a8ed63 100644
--- a/app/src/main/java/com/vectras/vm/VMManager.java
+++ b/app/src/main/java/com/vectras/vm/VMManager.java
@@ -23,7 +23,7 @@ public class VMManager {
     public static int pendingPosition = 0;
     public static int restoredVMs = 0;
 
-    public static void createNewVM(String name, String thumbnail, String drive, String arch, String cdrom, String params, String vmID, boolean dontcheckduplicateid) {
+    public static void createNewVM(String name, String thumbnail, String drive, String arch, String cdrom, String params, String vmID) {
         mapForCreateNewVM.clear();
         mapForCreateNewVM.put("imgName", name);
         mapForCreateNewVM.put("imgIcon", thumbnail);
@@ -33,12 +33,8 @@ public class VMManager {
         mapForCreateNewVM.put("imgArch", arch);
         mapForCreateNewVM.put("vmID", vmID);
 
-        if (!dontcheckduplicateid && VectrasApp.isFileExists(AppConfig.maindirpath + "/roms/" + Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString())) {
-            mapForCreateNewVM.put("vmID", ramdomVMID());
-        }
-
         listmapForCreateNewVM.clear();
-        listmapForCreateNewVM = new Gson().fromJson(VectrasApp.readFile(AppConfig.maindirpath + "roms-data.json"), new TypeToken<ArrayList<HashMap<String, Object>>>(){}.getType());
+        listmapForCreateNewVM = new Gson().fromJson(VectrasApp.readFile(AppConfig.romsdatajson), new TypeToken<ArrayList<HashMap<String, Object>>>(){}.getType());
 
         listmapForCreateNewVM.add(0,mapForCreateNewVM);
         finalJson = new Gson().toJson(listmapForCreateNewVM);
@@ -51,7 +47,7 @@ public class VMManager {
 
     public static void editVM(String name, String thumbnail, String drive, String arch, String cdrom, String params, int position) {
         listmapForCreateNewVM.clear();
-        listmapForCreateNewVM = new Gson().fromJson(VectrasApp.readFile(AppConfig.maindirpath + "roms-data.json"), new TypeToken<ArrayList<HashMap<String, Object>>>(){}.getType());
+        listmapForCreateNewVM = new Gson().fromJson(VectrasApp.readFile(AppConfig.romsdatajson), new TypeToken<ArrayList<HashMap<String, Object>>>(){}.getType());
 
         mapForCreateNewVM.clear();
         mapForCreateNewVM.put("imgName", name);
@@ -64,7 +60,7 @@ public class VMManager {
         if (listmapForCreateNewVM.get(position).containsKey("vmID")) {
             mapForCreateNewVM.put("vmID", Objects.requireNonNull(listmapForCreateNewVM.get(position).get("vmID")).toString());
         } else {
-            mapForCreateNewVM.put("vmID", ramdomVMID());
+            mapForCreateNewVM.put("vmID", idGenerator());
         }
 
         listmapForCreateNewVM.set(position,mapForCreateNewVM);
@@ -75,7 +71,21 @@ public class VMManager {
         VectrasApp.writeToFile(AppConfig.maindirpath + "/roms/" + Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString(), "vmID.txt", Objects.requireNonNull(mapForCreateNewVM.get("vmID")).toString());
     }
 
-    public static String ramdomVMID() {
+    public static String idGenerator() {
+        String _result = startRamdomVMID();
+
+        if (VectrasApp.isFileExists(AppConfig.maindirpath + "/roms/" + _result)) {
+            _result = startRamdomVMID();
+        }
+
+        if (VectrasApp.isFileExists(AppConfig.maindirpath + "/roms/" + _result)) {
+            _result = startRamdomVMID();
+        }
+
+        return _result;
+    }
+
+    public static String startRamdomVMID() {
         String addAdb = "";
         Random random = new Random();
         int randomAbc = random.nextInt(12);
@@ -123,7 +133,7 @@ public class VMManager {
             int _startRepeat = 0;
             String _currentVMIDToScan = "";
             ArrayList<String> _filelist = new ArrayList<>();
-            VectrasApp.listDir(AppConfig.maindirpath + "roms", _filelist);
+            VectrasApp.listDir(AppConfig.vmFolder, _filelist);
             if (!_filelist.isEmpty()) {
                 for (int _repeat = 0; _repeat < (int)(_filelist.size()); _repeat++) {
                     if (_startRepeat < _filelist.size()) {
@@ -152,7 +162,7 @@ public class VMManager {
             int _startRepeat = 0;
             String _currentVMIDToScan = "";
             ArrayList<String> _filelist = new ArrayList<>();
-            VectrasApp.listDir(AppConfig.maindirpath + "roms/", _filelist);
+            VectrasApp.listDir(AppConfig.vmFolder, _filelist);
             if (!_filelist.isEmpty()) {
                 for (int _repeat = 0; _repeat < (int)(_filelist.size()); _repeat++) {
                     if (_startRepeat < _filelist.size()) {
@@ -183,7 +193,7 @@ public class VMManager {
             int _startRepeat = 0;
             String _currentVMIDToScan = "";
             ArrayList<String> _filelist = new ArrayList<>();
-            VectrasApp.listDir(AppConfig.maindirpath + "roms/", _filelist);
+            VectrasApp.listDir(AppConfig.vmFolder, _filelist);
             if (!_filelist.isEmpty()) {
                 for (int _repeat = 0; _repeat < (int)(_filelist.size()); _repeat++) {
                     if (_startRepeat < _filelist.size()) {
@@ -203,11 +213,11 @@ public class VMManager {
     }
 
     public static void cleanUp() {
-        finalJson = VectrasApp.readFile(AppConfig.maindirpath + "roms-data.json");
+        finalJson = VectrasApp.readFile(AppConfig.romsdatajson);
         if (!finalJson.isEmpty()) {
             int _startRepeat = 0;
             ArrayList<String> _filelist = new ArrayList<>();
-            VectrasApp.listDir(AppConfig.maindirpath + "roms", _filelist);
+            VectrasApp.listDir(AppConfig.vmFolder, _filelist);
             if (!_filelist.isEmpty()) {
                 for (int _repeat = 0; _repeat < (int)(_filelist.size()); _repeat++) {
                     if (_startRepeat < _filelist.size()) {
@@ -229,7 +239,7 @@ public class VMManager {
         String _result ="";
         restoredVMs = 0;
         ArrayList<String> _filelist = new ArrayList<>();
-        VectrasApp.listDir(AppConfig.maindirpath + "roms/", _filelist);
+        VectrasApp.listDir(AppConfig.vmFolder, _filelist);
         if (!_filelist.isEmpty()) {
             for (int _repeat = 0; _repeat < (int)(_filelist.size()); _repeat++) {
                 if (_startRepeat < _filelist.size()) {
@@ -250,7 +260,7 @@ public class VMManager {
                                     if (VectrasApp.isFileExists(_filelist.get((int)(_startRepeat)) + "/vmID.old.txt")) {
                                         enableVMID(VectrasApp.readFile(_filelist.get((int)(_startRepeat)) + "/vmID.old.txt"));
                                     } else {
-                                        VectrasApp.writeToFile(_filelist.get((int)(_startRepeat)), "/vmID.txt", VMManager.ramdomVMID());
+                                        VectrasApp.writeToFile(_filelist.get((int)(_startRepeat)), "/vmID.txt", VMManager.idGenerator());
                                     }
                                     restoredVMs++;
                                 } else if (VectrasApp.checkJSONIsNormalFromString(VectrasApp.readFile(AppConfig.maindirpath + "/roms-data.json").replaceAll("]", "," + _resulttemp + "]"))) {
@@ -262,7 +272,7 @@ public class VMManager {
                                     if (VectrasApp.isFileExists(_filelist.get((int)(_startRepeat)) + "/vmID.old.txt")) {
                                         enableVMID(VectrasApp.readFile(_filelist.get((int)(_startRepeat)) + "/vmID.old.txt"));
                                     } else {
-                                        VectrasApp.writeToFile(_filelist.get((int)(_startRepeat)), "/vmID.txt", VMManager.ramdomVMID());
+                                        VectrasApp.writeToFile(_filelist.get((int)(_startRepeat)), "/vmID.txt", VMManager.idGenerator());
                                     }
                                     restoredVMs++;
                                 } else {
@@ -276,9 +286,9 @@ public class VMManager {
                     if (_startRepeat == _filelist.size()) {
                         if (!_result.isEmpty()) {
                             if (VectrasApp.checkJSONIsNormalFromString("[" + _result + "]")) {
-                                if (VectrasApp.isFileExists(AppConfig.maindirpath + "roms-data.json")) {
-                                    if (VectrasApp.checkJSONIsNormal(AppConfig.maindirpath + "roms-data.json")) {
-                                        String _JSONcontent = VectrasApp.readFile(AppConfig.maindirpath + "roms-data.json");
+                                if (VectrasApp.isFileExists(AppConfig.romsdatajson)) {
+                                    if (VectrasApp.checkJSONIsNormal(AppConfig.romsdatajson)) {
+                                        String _JSONcontent = VectrasApp.readFile(AppConfig.romsdatajson);
                                         String _JSONcontentnew = _JSONcontent.replaceAll("]", _result + "]");
                                         if (VectrasApp.checkJSONIsNormalFromString(_JSONcontentnew)) {
                                             VectrasApp.writeToFile(AppConfig.maindirpath, "roms-data.json", _JSONcontentnew);
@@ -309,7 +319,7 @@ public class VMManager {
             return;
         int _startRepeat = 0;
         ArrayList<String> _filelist = new ArrayList<>();
-        VectrasApp.listDir(AppConfig.maindirpath + "roms/", _filelist);
+        VectrasApp.listDir(AppConfig.vmFolder, _filelist);
         if (!_filelist.isEmpty()) {
             for (int _repeat = 0; _repeat < (int)(_filelist.size()); _repeat++) {
                 if (_startRepeat < _filelist.size()) {
diff --git a/app/src/main/java/com/vectras/vm/VectrasApp.java b/app/src/main/java/com/vectras/vm/VectrasApp.java
index f50cff0..557cabb 100644
--- a/app/src/main/java/com/vectras/vm/VectrasApp.java
+++ b/app/src/main/java/com/vectras/vm/VectrasApp.java
@@ -545,10 +545,6 @@ public class VectrasApp extends Application {
 	}
 
 	public static void deleteDirectory(String _pathToDelete) {
-		//Prevent accidental deletion of user data outside of Vectras VM.
-		if (!_pathToDelete.contains(AppConfig.maindirpath))
-			return;
-
 		File _dir = new File(_pathToDelete);
 		if (_dir.isDirectory()) {
 			String[] children = _dir.list();
@@ -743,7 +739,8 @@ public class VectrasApp extends Application {
 		AppConfig.maindirpath = FileUtils.getExternalFilesDirectory(_activity).getPath() + "/";
 		AppConfig.sharedFolder = AppConfig.maindirpath + "SharedFolder/";
 		AppConfig.downloadsFolder = AppConfig.maindirpath + "Downloads/";
-		AppConfig.romsdatajson = Environment.getExternalStorageDirectory().toString() + "/Documents/VectrasVM/roms-data.json";
+		AppConfig.romsdatajson = AppConfig.maindirpath + "roms-data.json";
+		AppConfig.vmFolder = AppConfig.maindirpath + "roms/";
 	}
 
 	public static String quickScanDiskFileInFolder(String _foderpath) {
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index dc0c5bf..96835d4 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -369,6 +369,7 @@
     <string name="restore">يعيد</string>
     <string name="restore_content">سيتم استعادة الأجهزة الافتراضية المحذوفة إذا اخترت مسبقًا الاحتفاظ بجميع الملفات.</string>
     <string name="restored">تم ترميمه</string>
+    <string name="qemu_params_is_empty">معلمات QEMU فارغة. سيتم تعيين بعض الأجهزة التي سيتم محاكاتها على إعدادات QEMU الافتراضية.</string>
 
     <!--======================TERMUX STRINGS====================-->
     <string name="application_name">Vterm</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 285aa7d..1aa2e72 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="app_name">Vectras VM</string>
     
     <!--======================VECTRAS STRINGS====================-->
-    <string name="app_version" translatable="false">v2.9.4 (New York Cheesecake)</string>
+    <string name="app_version" translatable="false">v2.9.4 (Oatmeal Cookie)</string>
     <string name="qemu_version" translatable="false">Stable</string>
     <string name="str_home">Home</string>
     <string name="str_logger">Logger</string>
@@ -371,6 +371,7 @@
     <string name="restore">Restore</string>
     <string name="restore_content">Deleted virtual machines will be restored if you previously chose to keep all files.</string>
     <string name="restored">Restored</string>
+    <string name="qemu_params_is_empty">QEMU Params is empty. Some hardware to be emulated will be set by default by QEMU.</string>
 
 
     <!--======================TERMUX STRINGS====================-->
diff --git a/web/data/UpdateConfig.json b/web/data/UpdateConfig.json
index 8c6d1fc..af193c9 100644
--- a/web/data/UpdateConfig.json
+++ b/web/data/UpdateConfig.json
@@ -1,6 +1,6 @@
 {
     "versionCode":"20",
-    "versionName":"v2.9.4,v2.9.4-jellybean,v2.9.4-lemonmeringuepie",
+    "versionName":"v2.9.4,v2.9.4-jellybean,v2.9.4-lemonmeringuepie,v2.9.4-newyorkcheesecake,v2.9.4-oatmealcookie",
     "size": "60 MB",
     "url": "https://github.com/xoureldeen/Vectras-VM-Android/releases/v2.9.4",
     "Message": "<h2>v2.9.4</h2><ul><li>Now you can change locale in app settings.</li><li>Now you can access x11 settings.</li><li>New button to set full screen in x11 display.</li><li>Enhanced UI.</li><li>Chinese language by <a href=\"https://github.com/adk23333\" target=\"_blank\">@adk23333</a></li></ul><br><br>New updates are live!",