diff --git a/GAMS/IntExtOpt.gms b/GAMS/IntExtOpt.gms
index 82ad1ece55bd0cb47769065ba39fd43265a20925..f69d1de341f3a906981d8340c8409b3ec4cfb5b4 100644
--- a/GAMS/IntExtOpt.gms
+++ b/GAMS/IntExtOpt.gms
@@ -231,7 +231,10 @@ $gdxin
  exportAmount.L(all_types) = previousExportAmount(all_types);
   
  SOLVE LAND_USE USING NLP MINIMIZING total_cost;
-       
+
+* Try solving again if not locally optimal
+ if ((LAND_USE.modelstat ne 2), SOLVE LAND_USE USING NLP MINIMIZING total_cost;)
+      
  display agriLandExpansion.L, previousArea, irrigMaxRate, otherIntensity.L, fertI.L, irrigI.L, area.L, cropIncrease.L, cropDecrease.L, pastureIncrease.L, pastureDecrease.L;
  display net_supply.l, demand, ruminantFeed.l, monogastricFeed.l, importAmount.l, exportAmount.l;
 
@@ -272,4 +275,4 @@ $gdxin
  Scalar ms 'model status', ss 'solve status'; 
  ms=LAND_USE.modelstat;
  ss=LAND_USE.solvestat;
- 
\ No newline at end of file
+ 
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index fed86e13ed84a0c5ed75491ad746f233da0b65ba..86a8a3290a11fcc71e880b737621b26e729e7353 100755
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -382,7 +382,8 @@ public class ModelConfig {
 	public static final boolean DEBUG_JUST_DEMAND_OUTPUT = getBooleanProperty("DEBUG_JUST_DEMAND_OUTPUT", false);
 	public static final boolean DEBUG_LIMIT_COUNTRIES = getBooleanProperty("DEBUG_LIMIT_COUNTRIES", false);
 	public static final String DEBUG_COUNTRY_NAME = getProperty("DEBUG_COUNTRY_NAME", "United States of America");
-	public static final String GAMS_COUNTRY_TO_SAVE = getProperty("GAMS_COUNTRY_TO_SAVE", "China");;
+	public static final String GAMS_COUNTRY_TO_SAVE = getProperty("GAMS_COUNTRY_TO_SAVE", "China");
+	public static final boolean SAVE_GAMS_DEBUG_OUTPUTS = getBooleanProperty("SAVE_GAMS_DEBUG_OUTPUTS", false);
 	public static final boolean EXCLUDE_COUNTRIES_IN_LIST = getBooleanProperty("EXCLUDE_COUNTRIES_IN_LIST", false);
 	public static final String EXCLUDED_COUNTRIES_FILE = DATA_DIR + File.separator + "countries_excluded.csv";
 	
diff --git a/src/ac/ed/lurg/country/CountryAgent.java b/src/ac/ed/lurg/country/CountryAgent.java
index 1c02b5576d13bd8989ea3a991c8b16518fc3765c..fa28b19d0e15b8e2fd2806481d7b799323c61b7e 100644
--- a/src/ac/ed/lurg/country/CountryAgent.java
+++ b/src/ac/ed/lurg/country/CountryAgent.java
@@ -163,6 +163,19 @@ public class CountryAgent extends AbstractCountryAgent {
 					FileSystems.getDefault().getPath(ModelConfig.TEMP_DIR + File.separator + "_gams_java_gdb1.gdx"),
 					FileSystems.getDefault().getPath(ModelConfig.TEMP_DIR + File.separator + country.getName().replaceAll("\\s+","") + currentTimestep.getYear() + ext + ".gdx"),
 					StandardCopyOption.REPLACE_EXISTING);
+			
+			if (ModelConfig.SAVE_GAMS_DEBUG_OUTPUTS) {
+				Files.copy(
+					FileSystems.getDefault().getPath(ModelConfig.TEMP_DIR + File.separator + "_gams_java_gdb2.gdx"),
+					FileSystems.getDefault().getPath(ModelConfig.TEMP_DIR + File.separator + country.getName().replaceAll("\\s+","") + currentTimestep.getYear() + ext + "_2.gdx"),
+					StandardCopyOption.REPLACE_EXISTING);
+					
+				Files.copy(
+					FileSystems.getDefault().getPath(ModelConfig.TEMP_DIR + File.separator + "_gams_java_gjo1.lst"),
+					FileSystems.getDefault().getPath(ModelConfig.TEMP_DIR + File.separator + country.getName().replaceAll("\\s+","") + currentTimestep.getYear() + ext + ".lst"),
+					StandardCopyOption.REPLACE_EXISTING);
+			}
+				
 		} catch (IOException e) {
 			LogWriter.print(e);
 		}