diff --git a/DCS-Shortcut-Generator/MainWindow.xaml b/DCS-Shortcut-Generator/MainWindow.xaml
index 89f0877..426d2de 100644
--- a/DCS-Shortcut-Generator/MainWindow.xaml
+++ b/DCS-Shortcut-Generator/MainWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:local="clr-namespace:DCS_Shortcut_Generator"
         mc:Ignorable="d"
-        Title="DCS Shortcut Generator v1.2 by Bailey" Height="390" Width="500">
+        Title="DCS Shortcut Generator v1.2 by Bailey" Height="450" Width="500">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="5"/>
@@ -29,6 +29,7 @@
             <RowDefinition Height="AUTO"/>
             <RowDefinition Height="AUTO"/>
             <RowDefinition Height="AUTO"/>
+            <RowDefinition Height="AUTO"/>
             <RowDefinition Height="5"/>
         </Grid.RowDefinitions>
 
@@ -71,19 +72,18 @@
         
         <TextBox x:Name="textBlock_userOptionsNewFile" Grid.Row="9" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Height="20" 
                  VerticalAlignment="Center" IsEnabled="False"/>
+        <CheckBox x:Name="checkBox_updateOptions" Grid.Row="10" Grid.Column="2" Grid.ColumnSpan="2" Margin="5"  IsEnabled="False">Keep options changes done during DCS session</CheckBox>
         <Button x:Name="button_userOptionsNewFile" Content="Select Swap Options.lua" Grid.Row="9" Grid.Column="1" Margin="5" 
                 Height="20" VerticalAlignment="Center" Click="button_userOptionsNewFile_Click"/>
-
-        
         
-        <Label Content="DCS Width Override" Grid.Row="10" Grid.Column="1"  Margin="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-        <TextBox x:Name="textBlock_dcsWidth" Grid.Row="10" Grid.Column="2" Grid.ColumnSpan="1" Margin="5" Width="75" Height="20" 
+        <Label Content="DCS Width Override" Grid.Row="11" Grid.Column="1"  Margin="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+        <TextBox x:Name="textBlock_dcsWidth" Grid.Row="11" Grid.Column="2" Grid.ColumnSpan="1" Margin="5" Width="75" Height="20" 
                  VerticalAlignment="Center" HorizontalAlignment="Left" PreviewTextInput="NumberValidationTextBox" PreviewKeyDown="textBlock_dcsWidth_PreviewKeyDown"
                  CommandManager.PreviewExecuted="textBox_PreviewExecuted" ContextMenu="{x:Null}"/>
 
 
-        <Label Content="DCS Height Override" Grid.Row="11" Grid.Column="1" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-        <TextBox x:Name="textBlock_dcsHeight" Grid.Row="11" Grid.Column="2" Grid.ColumnSpan="1" Margin="5" Width="75" Height="20" 
+        <Label Content="DCS Height Override" Grid.Row="12" Grid.Column="1" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+        <TextBox x:Name="textBlock_dcsHeight" Grid.Row="12" Grid.Column="2" Grid.ColumnSpan="1" Margin="5" Width="75" Height="20" 
                  VerticalAlignment="Center" HorizontalAlignment="Left" PreviewTextInput="NumberValidationTextBox" 
                  PreviewKeyDown="textBlock_dcsHeight_PreviewKeyDown" CommandManager.PreviewExecuted="textBox_PreviewExecuted" ContextMenu="{x:Null}"/>
 
diff --git a/DCS-Shortcut-Generator/MainWindow.xaml.cs b/DCS-Shortcut-Generator/MainWindow.xaml.cs
index 8d73362..1fa77ad 100644
--- a/DCS-Shortcut-Generator/MainWindow.xaml.cs
+++ b/DCS-Shortcut-Generator/MainWindow.xaml.cs
@@ -25,25 +25,47 @@ namespace DCS_Shortcut_Generator
     /// </summary>
     public partial class MainWindow : Window
     {
+        private Process dcsProcess;
+        private static bool shouldUpdateOptions;
+        private static string currentOptionFile;
+        private static string newOptionFileName;
+
         public MainWindow()
         {
             //https://wpf-tutorial.com/wpf-application/command-line-parameters/
             //https://stackoverflow.com/questions/9343381/wpf-command-line-arguments-a-smart-way
-            string[] args = Environment.GetCommandLineArgs();//put the stuff in Target in an array
+            string[] args = Environment.GetCommandLineArgs(); //put the stuff in Target in an array
             //System.Windows.MessageBox.Show(args[1]);//show the first argument. debug
-            if (args.Length > 1)//if there is more than 1 thing in Target, then process it as a shortcut
-                                //instead of running the generator
+            if (args.Length > 1) //if there is more than 1 thing in Target, then process it as a shortcut
+                //instead of running the generator
             {
-                processAsShortcut();//go to what used to be the console application
-                System.Windows.Application.Current.Shutdown();//quits the program so that it does not show up
+                processAsShortcut(); //go to what used to be the console application
+                if (dcsProcess != null && shouldUpdateOptions)
+                {
+                    Application.Current.MainWindow.WindowState = WindowState.Minimized;
+                    dcsProcess.EnableRaisingEvents = true;
+                    dcsProcess.Exited += (sender, e) =>
+                    {
+                        System.IO.File.Delete(newOptionFileName + ".prev");
+                        System.IO.File.Move(newOptionFileName,
+                            newOptionFileName + ".prev");
+                        System.IO.File.Copy(currentOptionFile, newOptionFileName);
+                        Application.Current.Shutdown();
+                    };
+                }
+                else
+                {
+                    Application.Current.Shutdown();
+                }
             }
+
             //else...run the generator
             InitializeComponent();
             PredictUserDcsExePath();
             PredictUserOptionsLuaPath();
         }
 
-        private void PredictUserOptionsLuaPath()//prediction for the users default options lua file
+        private void PredictUserOptionsLuaPath() //prediction for the users default options lua file
         {
             string userName = System.Environment.UserName;
 
@@ -121,12 +143,17 @@ private void PredictUserDcsExePath()
             {
                 try
                 {
-                    string[] strings = { "0" };//init a string array
-                    const string keyNameBeta = @"HKEY_CURRENT_USER\SOFTWARE\Eagle Dynamics\DCS World OpenBeta";//this is the key we are looking for
-                    string dcsLocation = (string)Registry.GetValue(keyNameBeta, "Path", strings);//"Path is the subkey(?)
-                    string addOnPath = @"bin\DCS.exe";//the above terminates in the main folder path. use this to continue to the exe
-                    string[] paths = { dcsLocation, addOnPath };//prepariong for the Combine
-                    textBlock_userDcsExeFile.Text = Path.Combine(paths);//populate the text field with the result
+                    string[] strings = { "0" }; //init a string array
+                    const string
+                        keyNameBeta =
+                            @"HKEY_CURRENT_USER\SOFTWARE\Eagle Dynamics\DCS World OpenBeta"; //this is the key we are looking for
+                    string dcsLocation =
+                        (string)Registry.GetValue(keyNameBeta, "Path", strings); //"Path is the subkey(?)
+                    string
+                        addOnPath =
+                            @"bin\DCS.exe"; //the above terminates in the main folder path. use this to continue to the exe
+                    string[] paths = { dcsLocation, addOnPath }; //prepariong for the Combine
+                    textBlock_userDcsExeFile.Text = Path.Combine(paths); //populate the text field with the result
                     //System.Windows.MessageBox.Show(dcsLocation);//debug
                     //System.Windows.MessageBox.Show(addOnPath);//debug
                     //System.Windows.MessageBox.Show(textBlock_userDcsExeFile.Text);//debug
@@ -161,15 +188,14 @@ private void PredictUserDcsExePath()
 
         private void processAsShortcut()
         {
-            string[] args = Environment.GetCommandLineArgs();//put the stuff in Target in an array
+            string[] args = Environment.GetCommandLineArgs(); //put the stuff in Target in an array
             //https://stackoverflow.com/questions/27965131/how-to-remove-the-first-element-in-an-array/27965285
-            args = args.Skip(1).ToArray();//this removed the first element of the array, which was the path of this app
+            args = args.Skip(1).ToArray(); //this removed the first element of the array, which was the path of this app
 
             //the minimum args length will be 3 due to the condition checking of the generator
 
-            if (args.Length == 3)//the options lua was defined. do the same thing as Length == 2
+            if (args.Length == 4) //the options lua was defined. do the same thing as Length == 2
             {
-
                 Console.WriteLine("Condition 3");
 
                 string arg_dcsVrOrNoVr = args[1];
@@ -177,9 +203,9 @@ private void processAsShortcut()
                 string arg_dcsOptionsLuaFileLocation;
 
 
-                if (System.IO.File.Exists(args[2]))//if the new options lua file does not exist, exit
+                if (System.IO.File.Exists(args[2])) //if the new options lua file does not exist, exit
                 {
-                    arg_dcsOptionsLuaFileLocation = args[2];//will remain unused in this Condition
+                    arg_dcsOptionsLuaFileLocation = args[2]; //will remain unused in this Condition
                 }
                 else
                 {
@@ -207,23 +233,24 @@ private void processAsShortcut()
                     {
                         Console.WriteLine("The VR argument is not valid.");
                         MessageBox.Show("The VR argument is not valid.");
-                        return;//the vr argument was not valid
+                        return; //the vr argument was not valid
                     }
 
-                    Process.Start(@arg_dcsExeFileLocation, vrargument);
+                    dcsProcess = Process.Start(@arg_dcsExeFileLocation, vrargument);
                 }
                 else
                 {
                     Console.WriteLine("The DCS exe path cannot be found.");
                     MessageBox.Show("The DCS exe path cannot be found.");
-                    return;//the path that the user entered did not exist
+                    return; //the path that the user entered did not exist
                 }
-            }//end of condition 3
+            } //end of condition 3
 
-            else if (args.Length == 4)//either width was entered or the new dcs options lua was defined
-            {                           //if the last arg is a number, then this fails. 
-                                        //If its a path, then use it to replace the options lua path
-                                        //due to how this version of the program works, you should never see just 1 dimension
+            else if (args.Length == 5) //either width was entered or the new dcs options lua was defined
+            {
+                //if the last arg is a number, then this fails. 
+                //If its a path, then use it to replace the options lua path
+                //due to how this version of the program works, you should never see just 1 dimension
                 Console.WriteLine("Condition 4");
 
                 //file exists checks
@@ -252,11 +279,11 @@ private void processAsShortcut()
                 {
                     vrargument = ("--force_disable_VR");
                 }
-                else//if there isnt a matching entry, just quit
+                else //if there isnt a matching entry, just quit
                 {
                     Console.WriteLine("The VR argument is not valid.");
                     MessageBox.Show("The VR argument is not valid.");
-                    return;//the vr argument was not valid
+                    return; //the vr argument was not valid
                 }
 
                 string arg_dcsExeFileLocation = args[0];
@@ -264,38 +291,35 @@ private void processAsShortcut()
                 string arg_dcsOptionsLuaFileLocation = args[2];
                 string arg_widthOrDcsNewOptionsLuaFileLocation = args[3];
 
+                bool updateOptions = bool.Parse(args[4]);
 
-                int arg_width;//init the int for the width of the screen
-                bool success = int.TryParse(args[3], out arg_width);//if it can be parsed
+                int arg_width; //init the int for the width of the screen
+                bool success = int.TryParse(args[4], out arg_width); //if it can be parsed
 
-                if (success)//if "success" is true, then the parse was good and it's an int
+                if (success) //if "success" is true, then the parse was good and it's an int
                 {
-                    Console.WriteLine(arg_width + " is an int.");//debug
-                                                                 //because of this we revert to a "condition 2", from the old version
+                    Console.WriteLine(arg_width + " is an int."); //debug
+                    //because of this we revert to a "condition 2", from the old version
                 }
-                else//if "success" is false, then the parse was bad and it's a string
+                else //if "success" is false, then the parse was bad and it's a string
                 {
-                    Console.WriteLine(arg_widthOrDcsNewOptionsLuaFileLocation + " is an string.");//debug
-
+                    Console.WriteLine(arg_widthOrDcsNewOptionsLuaFileLocation + " is an string."); //debug
 
-                    //code for the file swap here
-                    System.IO.File.Delete(arg_widthOrDcsNewOptionsLuaFileLocation + ".bak");//deletes the backup file
-                    System.IO.File.Move(arg_dcsOptionsLuaFileLocation, arg_widthOrDcsNewOptionsLuaFileLocation + ".bak");//moves the original options lua file to the backup location
-                                                                                                                         //File.Replace(arg_dcsNewOptionsLuaFileLocation, arg_dcsOptionsLuaFileLocation, null);//null or "Options.lua.bak"
 
-                    //Console.WriteLine("Replacing " + arg_dcsNewOptionsLuaFileLocation + "with " + arg_dcsOptionsLuaFileLocation);
-                    System.IO.File.Copy(arg_widthOrDcsNewOptionsLuaFileLocation, arg_dcsOptionsLuaFileLocation);//puts the replacement file into the original location
+                    SwapOptionFiles(arg_widthOrDcsNewOptionsLuaFileLocation, arg_dcsOptionsLuaFileLocation,
+                        updateOptions);
                 }
 
-                Console.WriteLine(arg_dcsExeFileLocation);//debug
-                Console.WriteLine(arg_dcsVrOrNoVr);//debug
-                Console.WriteLine(arg_widthOrDcsNewOptionsLuaFileLocation);//debug
+                Console.WriteLine(arg_dcsExeFileLocation); //debug
+                Console.WriteLine(arg_dcsVrOrNoVr); //debug
+                Console.WriteLine(arg_widthOrDcsNewOptionsLuaFileLocation); //debug
 
-                Process.Start(@arg_dcsExeFileLocation, vrargument);
-            }//end of condition 4
+                dcsProcess = Process.Start(@arg_dcsExeFileLocation, vrargument);
+            } //end of condition 4
 
-            else if (args.Length == 5)//only width and height was entered. replace the original option
-            {                          //lua with them
+            else if (args.Length == 6) //only width and height was entered. replace the original option
+            {
+                //lua with them
                 Console.WriteLine("Condition 5");
 
                 //file exists checks
@@ -324,11 +348,11 @@ private void processAsShortcut()
                 {
                     vrargument = ("--force_disable_VR");
                 }
-                else//if there isnt a matching entry, just quit
+                else //if there isnt a matching entry, just quit
                 {
                     Console.WriteLine("The VR argument is not valid.");
                     MessageBox.Show("The VR argument is not valid.");
-                    return;//the vr argument was not valid
+                    return; //the vr argument was not valid
                 }
 
                 string arg_dcsExeFileLocation = args[0];
@@ -336,46 +360,51 @@ private void processAsShortcut()
                 string arg_dcsOptionsLuaFileLocation = args[2];
 
                 int arg_width;
-                bool success_width = int.TryParse(args[3], out arg_width);
+                bool success_width = int.TryParse(args[4], out arg_width);
 
 
-                int arg_height;//init the int for the height of the screen
-                bool success_height = int.TryParse(args[4], out arg_height);//if it can be parsed
+                int arg_height; //init the int for the height of the screen
+                bool success_height = int.TryParse(args[5], out arg_height); //if it can be parsed
 
                 if (success_width) //if "success" is true, then the parse was good and it's an int
                 {
-                    if (success_height)//if "success" is true again, then the parse was good and it's an int
+                    if (success_height) //if "success" is true again, then the parse was good and it's an int
                     {
-                        Console.WriteLine(arg_width + " is the width.");//debug
-                        Console.WriteLine(arg_height + " is the height.");//debug
+                        Console.WriteLine(arg_width + " is the width."); //debug
+                        Console.WriteLine(arg_height + " is the height."); //debug
                     }
-                    else//if "success" is false, then the parses were bad
+                    else //if "success" is false, then the parses were bad
                     {
                         Console.WriteLine("The the height argument is not valid.");
                         MessageBox.Show("The the height argument is not valid.");
-                        return;//quit
+                        return; //quit
                     }
                 }
-                else//if "success" is false, then the parses were bad
+                else //if "success" is false, then the parses were bad
                 {
                     Console.WriteLine("The the width argument is not valid.");
                     MessageBox.Show("The the width argument is not valid.");
-                    return;//quit
+                    return; //quit
                 }
 
-                Console.WriteLine(arg_dcsExeFileLocation);//debug
-                Console.WriteLine(arg_dcsVrOrNoVr);//debug
+                Console.WriteLine(arg_dcsExeFileLocation); //debug
+                Console.WriteLine(arg_dcsVrOrNoVr); //debug
 
-                var optionsLuaContents = LsonVars.Parse(System.IO.File.ReadAllText(arg_dcsOptionsLuaFileLocation));//put the contents of the options lua file into a lua read
-                optionsLuaContents["options"]["graphics"]["width"] = arg_width;//swap in the users width
-                optionsLuaContents["options"]["graphics"]["height"] = arg_height;//swap in the users height
-                System.IO.File.WriteAllText(arg_dcsOptionsLuaFileLocation, LsonVars.ToString(optionsLuaContents)); // serialize back to a file
+                var optionsLuaContents =
+                    LsonVars.Parse(
+                        System.IO.File.ReadAllText(
+                            arg_dcsOptionsLuaFileLocation)); //put the contents of the options lua file into a lua read
+                optionsLuaContents["options"]["graphics"]["width"] = arg_width; //swap in the users width
+                optionsLuaContents["options"]["graphics"]["height"] = arg_height; //swap in the users height
+                System.IO.File.WriteAllText(arg_dcsOptionsLuaFileLocation,
+                    LsonVars.ToString(optionsLuaContents)); // serialize back to a file
 
-                Process.Start(@arg_dcsExeFileLocation, vrargument);//run the program
-            }//end of condition 5
-            else if (args.Length == 6)//every arg has been fulfilled
-            {                           //first replace the options lua
-                                        //then replace the width and height
+                dcsProcess = Process.Start(@arg_dcsExeFileLocation, vrargument); //run the program
+            } //end of condition 5
+            else if (args.Length == 7) //every arg has been fulfilled
+            {
+                //first replace the options lua
+                //then replace the width and height
                 Console.WriteLine("Condition 6");
 
                 //file exists checks
@@ -411,11 +440,11 @@ private void processAsShortcut()
                 {
                     vrargument = ("--force_disable_VR");
                 }
-                else//if there isnt a matching entry, just quit
+                else //if there isnt a matching entry, just quit
                 {
                     Console.WriteLine("The VR argument is not valid.");
                     MessageBox.Show("The VR argument is not valid.");
-                    return;//the vr argument was not valid
+                    return; //the vr argument was not valid
                 }
 
 
@@ -423,54 +452,68 @@ private void processAsShortcut()
 
                 string arg_dcsOptionsLuaFileLocation = args[2];
                 string arg_dcsNewOptionsLuaFileLocation = args[3];
+                bool updateOptions = bool.Parse(args[4]);
 
                 int arg_width;
-                bool success_width = int.TryParse(args[4], out arg_width);
-                int arg_height;//init the int for the height of the screen
-                bool success_height = int.TryParse(args[5], out arg_height);//if it can be parsed
+                bool success_width = int.TryParse(args[5], out arg_width);
+                int arg_height; //init the int for the height of the screen
+                bool success_height = int.TryParse(args[6], out arg_height); //if it can be parsed
 
                 if (success_width) //if "success" is true, then the parse was good and it's an int
                 {
-                    if (success_height)//if "success" is true again, then the parse was good and it's an int
+                    if (success_height) //if "success" is true again, then the parse was good and it's an int
                     {
-                        Console.WriteLine(arg_width + " is the width.");//debug
-                        Console.WriteLine(arg_height + " is the height.");//debug
+                        Console.WriteLine(arg_width + " is the width."); //debug
+                        Console.WriteLine(arg_height + " is the height."); //debug
                     }
-                    else//if "success" is false, then the parses were bad
+                    else //if "success" is false, then the parses were bad
                     {
                         Console.WriteLine("The the height argument is not valid.");
                         MessageBox.Show("The the height argument is not valid.");
-                        return;//quit
+                        return; //quit
                     }
                 }
-                else//if "success" is false, then the parses were bad
+                else //if "success" is false, then the parses were bad
                 {
                     Console.WriteLine("The the width argument is not valid.");
                     MessageBox.Show("The the width argument is not valid.");
-                    return;//quit
+                    return; //quit
                 }
 
-                Console.WriteLine(arg_dcsExeFileLocation);//debug
-                Console.WriteLine(arg_dcsVrOrNoVr);//debug
-                Console.WriteLine(arg_dcsOptionsLuaFileLocation);//debug
-                Console.WriteLine(arg_dcsNewOptionsLuaFileLocation);//debug
+                Console.WriteLine(arg_dcsExeFileLocation); //debug
+                Console.WriteLine(arg_dcsVrOrNoVr); //debug
+                Console.WriteLine(arg_dcsOptionsLuaFileLocation); //debug
+                Console.WriteLine(arg_dcsNewOptionsLuaFileLocation); //debug
 
-                //code for the file swap here
-                System.IO.File.Delete(arg_dcsNewOptionsLuaFileLocation + ".bak");//deletes the backup file
-                System.IO.File.Move(arg_dcsOptionsLuaFileLocation, arg_dcsNewOptionsLuaFileLocation + ".bak");//moves the original options lua file to the backup location
-                                                                                                    //File.Replace(arg_dcsNewOptionsLuaFileLocation, arg_dcsOptionsLuaFileLocation, null);//null or "Options.lua.bak"
-
-                //Console.WriteLine("Replacing " + arg_dcsNewOptionsLuaFileLocation + "with " + arg_dcsOptionsLuaFileLocation);
-                System.IO.File.Copy(arg_dcsNewOptionsLuaFileLocation, arg_dcsOptionsLuaFileLocation);//puts the replacement file into the original location
+                SwapOptionFiles(arg_dcsNewOptionsLuaFileLocation, arg_dcsOptionsLuaFileLocation, updateOptions);
 
                 Console.WriteLine("Width is: " + arg_width + ". Height is: " + arg_height);
-                var optionsLuaContents = LsonVars.Parse(System.IO.File.ReadAllText(arg_dcsOptionsLuaFileLocation));//put the contents of the options lua file into a lua read
-                optionsLuaContents["options"]["graphics"]["width"] = arg_width;//swap in the users width
-                optionsLuaContents["options"]["graphics"]["height"] = arg_height;//swap in the users height
-                System.IO.File.WriteAllText(arg_dcsOptionsLuaFileLocation, LsonVars.ToString(optionsLuaContents)); // serialize back to a file
+                var optionsLuaContents =
+                    LsonVars.Parse(
+                        System.IO.File.ReadAllText(
+                            arg_dcsOptionsLuaFileLocation)); //put the contents of the options lua file into a lua read
+                optionsLuaContents["options"]["graphics"]["width"] = arg_width; //swap in the users width
+                optionsLuaContents["options"]["graphics"]["height"] = arg_height; //swap in the users height
+                System.IO.File.WriteAllText(arg_dcsOptionsLuaFileLocation,
+                    LsonVars.ToString(optionsLuaContents)); // serialize back to a file
+
+                dcsProcess = Process.Start(@arg_dcsExeFileLocation, vrargument); //run the program
+            } //end of condition 6
+        }
 
-                Process.Start(@arg_dcsExeFileLocation, vrargument);//run the program
-            }//end of condition 6
+        private static void SwapOptionFiles(string arg_dcsNewOptionsLuaFileLocation,
+            string arg_dcsOptionsLuaFileLocation, bool updateOptions)
+        {
+            shouldUpdateOptions = updateOptions;
+            currentOptionFile = arg_dcsOptionsLuaFileLocation;
+            newOptionFileName = arg_dcsNewOptionsLuaFileLocation;
+            System.IO.File.Delete(arg_dcsNewOptionsLuaFileLocation + ".bak"); //deletes the backup file
+            System.IO.File.Move(arg_dcsOptionsLuaFileLocation,
+                arg_dcsNewOptionsLuaFileLocation + ".bak"); //moves the original options lua file to the backup location
+            //File.Replace(arg_dcsNewOptionsLuaFileLocation, arg_dcsOptionsLuaFileLocation, null);//null or "Options.lua.bak"
+            //Console.WriteLine("Replacing " + arg_dcsNewOptionsLuaFileLocation + "with " + arg_dcsOptionsLuaFileLocation);
+            System.IO.File.Copy(arg_dcsNewOptionsLuaFileLocation,
+                arg_dcsOptionsLuaFileLocation); //puts the replacement file into the original location
         }
 
         //https://stackoverflow.com/questions/10315188/open-file-dialog-and-select-a-file-using-wpf-controls-and-c-sharp
@@ -493,8 +536,8 @@ private void processAsShortcut()
         //If you want only letters then replace the regular expression as [^a-zA-Z]
         private void NumberValidationTextBox(object sender, TextCompositionEventArgs e)
         {
-        Regex regex = new Regex("[^0-9]+");
-        e.Handled = regex.IsMatch(e.Text);
+            Regex regex = new Regex("[^0-9]+");
+            e.Handled = regex.IsMatch(e.Text);
         }
 
         private void NumberDigitValidationTextBox(object sender, TextCompositionEventArgs e)
@@ -514,7 +557,7 @@ private void CreateShortcut()
 
 
             string dcsVrOption;
-            if (comboBox_userVR.SelectedIndex == 0  )//0 is disabled, 1 is enabled
+            if (comboBox_userVR.SelectedIndex == 0) //0 is disabled, 1 is enabled
             {
                 dcsVrOption = "novr";
             }
@@ -525,30 +568,34 @@ private void CreateShortcut()
 
             //https://stackoverflow.com/questions/1177872/strip-double-quotes-from-a-string-in-net
 
-            string dcsOptionsNewFile = textBlock_userOptionsNewFile.Text;//could be blank
+            string dcsOptionsNewFile = textBlock_userOptionsNewFile.Text; //could be blank
             //don't need to convert these because we already limited their input to numbers
-            string dcsWidth = textBlock_dcsWidth.Text;//could be blank
-            string dcsHeight = textBlock_dcsHeight.Text;//could be blank
+            string dcsWidth = textBlock_dcsWidth.Text; //could be blank
+            string dcsHeight = textBlock_dcsHeight.Text; //could be blank
 
             //string character length check of less than 259
             string generatedArguments = "\"" + dcsExeFile + "\" " +
-                "\"" + dcsVrOption + "\" " +
-                "\"" + dcsOptionsFile + "\" " +
-                "\"" + dcsOptionsNewFile + "\" " +
-                "\"" + dcsWidth + "\" " +
-                "\"" + dcsHeight + "\"";
+                                        "\"" + dcsVrOption + "\" " +
+                                        "\"" + dcsOptionsFile + "\" " +
+                                        "\"" + dcsOptionsNewFile + "\" " +
+                                        "\"" + checkBox_updateOptions.IsChecked + "\" " +
+                                        "\"" + dcsWidth + "\" " +
+                                        "\"" + dcsHeight + "\"";
 
             string generatedTarget = appExeFile + " " + generatedArguments;
 
-            generatedTarget = generatedTarget.Replace("\"\"", "");//replace double quotes with nothing. this will "auto format" the arguments
+            generatedTarget =
+                generatedTarget.Replace("\"\"",
+                    ""); //replace double quotes with nothing. this will "auto format" the arguments
 
             //System.Windows.MessageBox.Show(generatedTarget + " is " + generatedTarget.Length + " characters long.");//debug
 
             if (generatedTarget.Length > 259)
             {
                 int numberOfCharactersOver = generatedTarget.Length - 259;
-                System.Windows.MessageBox.Show("Export Target is " + numberOfCharactersOver + " characters too long. Export canceled, sorry. " +
-                    "\nSee README for details. Please define shorter paths.");
+                System.Windows.MessageBox.Show("Export Target is " + numberOfCharactersOver +
+                                               " characters too long. Export canceled, sorry. " +
+                                               "\nSee README for details. Please define shorter paths.");
                 return;
             }
 
@@ -556,28 +603,32 @@ private void CreateShortcut()
             string shortcutAddress = shortcutName + ".lnk";
             IWshShortcut shortcut = (IWshShortcut)shell.CreateShortcut(shortcutAddress);
             shortcut.Description = shortcutDescription;
-            
+
             //this is doubled up for some reason, above
             generatedArguments = "\"" + dcsExeFile + "\" " +
-                "\"" + dcsVrOption + "\" " +
-                "\"" + dcsOptionsFile + "\" " +
-                "\"" + dcsOptionsNewFile + "\" " +
-                "\"" + dcsWidth + "\" " +
-                "\"" + dcsHeight + "\"";
+                                 "\"" + dcsVrOption + "\" " +
+                                 "\"" + dcsOptionsFile + "\" " +
+                                 "\"" + dcsOptionsNewFile + "\" " +
+                                 "\"" + checkBox_updateOptions.IsChecked + "\" " +
+                                 "\"" + dcsWidth + "\" " +
+                                 "\"" + dcsHeight + "\"";
 
-            generatedArguments = generatedArguments.Replace("\"\"", "");//replace double quotes with nothing. this will "auto format" the arguments
+            generatedArguments =
+                generatedArguments.Replace("\"\"",
+                    ""); //replace double quotes with nothing. this will "auto format" the arguments
 
             shortcut.Arguments = generatedArguments;
 
             shortcut.TargetPath = appExeFile;
 
-            if (!String.IsNullOrEmpty(textBlock_userIconLocation.Text))//if the user picked an icon, use it
+            if (!String.IsNullOrEmpty(textBlock_userIconLocation.Text)) //if the user picked an icon, use it
             {
                 shortcut.IconLocation = textBlock_userIconLocation.Text;
             }
-            
-            shortcut.Save();//saves and exports the shortcut file
-            System.Windows.MessageBox.Show("Export Success! Exported to: " + System.IO.Path.GetDirectoryName(appExeFile).ToString());
+
+            shortcut.Save(); //saves and exports the shortcut file
+            System.Windows.MessageBox.Show("Export Success! Exported to: " +
+                                           System.IO.Path.GetDirectoryName(appExeFile).ToString());
             //Yay!!!
         }
 
@@ -588,7 +639,7 @@ private void button_userDcsExeFile_Click(object sender, RoutedEventArgs e)
 
             // Set filter for file extension and default file extension 
             dlg.DefaultExt = ".exe";
-            dlg.Filter = "exe files (*.exe)|*.exe";//pick an exe only
+            dlg.Filter = "exe files (*.exe)|*.exe"; //pick an exe only
 
             dlg.Title = "Example: " + @"C:\Program Files\Eagle Dynamics\DCS World\bin\DCS.exe";
             // Display OpenFileDialog by calling ShowDialog method 
@@ -610,7 +661,7 @@ private void button_userOptionsFile_Click(object sender, RoutedEventArgs e)
 
             // Set filter for file extension and default file extension 
             dlg.DefaultExt = ".lua";
-            dlg.Filter = "lua files (*.lua)|*.lua";//pick a lua only
+            dlg.Filter = "lua files (*.lua)|*.lua"; //pick a lua only
 
             string userName = System.Environment.UserName;
             dlg.Title = "Example: " + @"C:\Users\" + userName + @"\Saved Games\DCS\Config\options.lua";
@@ -651,19 +702,19 @@ private void button_userOptionsFile_Click(object sender, RoutedEventArgs e)
         private void button_export_Click(object sender, RoutedEventArgs e)
         {
             //if the minimum parameters are met, then
-            if (textBlock_userDcsExeFile.Text.Equals(""))//nothing was entered
+            if (textBlock_userDcsExeFile.Text.Equals("")) //nothing was entered
             {
                 System.Windows.MessageBox.Show("Select your DCS exe file.");
                 return;
             }
 
-            if (textBlock_userOptionsFile.Text.Equals(""))//nothing was entered
+            if (textBlock_userOptionsFile.Text.Equals("")) //nothing was entered
             {
                 System.Windows.MessageBox.Show("Select your Options lua file.");
                 return;
             }
 
-            if (textBlock_userShortcutName.Text.Equals(""))//nothing was entered
+            if (textBlock_userShortcutName.Text.Equals("")) //nothing was entered
             {
                 System.Windows.MessageBox.Show("Create a shortcut name.");
                 return;
@@ -677,6 +728,7 @@ private void button_export_Click(object sender, RoutedEventArgs e)
                 System.Windows.MessageBox.Show("Enter a DCS Width Override or remove the DCS Height Override.");
                 return;
             }
+
             if (String.IsNullOrEmpty(textBlock_dcsHeight.Text) && (!String.IsNullOrEmpty(textBlock_dcsWidth.Text)))
             {
                 System.Windows.MessageBox.Show("Enter a DCS Height Override or remove the DCS Width Override.");
@@ -693,11 +745,12 @@ private void button_userOptionsNewFile_Click(object sender, RoutedEventArgs e)
 
             // Set filter for file extension and default file extension 
             dlg.DefaultExt = ".lua";
-            dlg.Filter = "lua files (*.lua)|*.lua";//pick a lua only
+            dlg.Filter = "lua files (*.lua)|*.lua"; //pick a lua only
 
             string userName = System.Environment.UserName;
-            dlg.Title = "Example: " + @"C:\Users\" + userName + @"\Saved Games\DCS.openbeta\Config\OptionsPresets\HighSettings.lua";
-          
+            dlg.Title = "Example: " + @"C:\Users\" + userName +
+                        @"\Saved Games\DCS.openbeta\Config\OptionsPresets\HighSettings.lua";
+
 
             string userOptionsStableLocation = @"C:\Users\" + userName + @"\Saved Games\DCS\Config";
             string userOptionsBetaLocation = @"C:\Users\" + userName + @"\Saved Games\DCS.openbeta\Config";
@@ -706,7 +759,7 @@ private void button_userOptionsNewFile_Click(object sender, RoutedEventArgs e)
             //these are to assist the user in locating their correct directories. 
             //for the first one here, if there is something already in the text block, assume the user wants to 
             //access the same folder, so set the initial directory there. Otherwise, try the other folders
-            if (!String.IsNullOrEmpty(textBlock_userOptionsNewFile.Text) 
+            if (!String.IsNullOrEmpty(textBlock_userOptionsNewFile.Text)
                 && Directory.Exists(System.IO.Path.GetDirectoryName(textBlock_userOptionsNewFile.Text)))
             {
                 dlg.InitialDirectory = System.IO.Path.GetDirectoryName(textBlock_userOptionsNewFile.Text);
@@ -737,10 +790,13 @@ private void button_userOptionsNewFile_Click(object sender, RoutedEventArgs e)
                 // Open document 
                 string filename = dlg.FileName;
                 textBlock_userOptionsNewFile.Text = filename;
+                checkBox_updateOptions.IsEnabled = true;
             }
-            else//this serves as a way to "clear" the text box. press cancel
+            else //this serves as a way to "clear" the text box. press cancel
             {
                 textBlock_userOptionsNewFile.Text = null;
+                checkBox_updateOptions.IsEnabled = false;
+                checkBox_updateOptions.IsChecked = false;
             }
         }
 
@@ -764,7 +820,7 @@ private void textBlock_dcsHeight_PreviewKeyDown(object sender, KeyEventArgs e)
         //https://stackoverflow.com/questions/938145/make-wpf-textbox-as-cut-copy-and-paste-restricted
         private void textBox_PreviewExecuted(object sender, ExecutedRoutedEventArgs e)
         {
-            if (//e.Command == ApplicationCommands.Copy ||
+            if ( //e.Command == ApplicationCommands.Copy ||
                 //e.Command == ApplicationCommands.Cut ||
                 e.Command == ApplicationCommands.Paste)
             {
@@ -779,7 +835,7 @@ private void button_userIconLocation_Click(object sender, RoutedEventArgs e)
 
             // Set filter for file extension and default file extension 
             dlg.DefaultExt = ".ico";
-            dlg.Filter = "ico files (*.ico)|*.ico";//pick an ico only
+            dlg.Filter = "ico files (*.ico)|*.ico"; //pick an ico only
             dlg.Title = "Example: " + @"C:\Program Files\Eagle Dynamics\DCS World\FUI\DCS-1.ico";
 
             //a guess for the default install location
@@ -792,7 +848,7 @@ private void button_userIconLocation_Click(object sender, RoutedEventArgs e)
             {
                 dlg.InitialDirectory = @"C:\Program Files\Eagle Dynamics\DCS World\FUI";
             }
-            
+
 
             // Display OpenFileDialog by calling ShowDialog method 
             Nullable<bool> result = dlg.ShowDialog();
@@ -804,7 +860,7 @@ private void button_userIconLocation_Click(object sender, RoutedEventArgs e)
                 string filename = dlg.FileName;
                 textBlock_userIconLocation.Text = filename;
             }
-            else//this serves as a way to "clear" the text box. press cancel
+            else //this serves as a way to "clear" the text box. press cancel
             {
                 textBlock_userIconLocation.Text = null;
             }