diff --git a/data/bioenergy_futures_BAU.csv b/data/bioenergy_futures_BAU.csv
index c70877e7cef14ccd5275b4b87ba6c0ebc1400c76..e39a4124b648c576ca1f2778dbc56e91249b34e1 100644
--- a/data/bioenergy_futures_BAU.csv
+++ b/data/bioenergy_futures_BAU.csv
@@ -5,21 +5,21 @@ PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2010
 PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2015,42.5
 PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2020,53.125
 PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2025,66.40625
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2030,83.0078125
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2035,103.7597656
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2040,129.699707
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2045,116.7297363
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2050,105.0567627
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2055,94.55108643
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2060,85.09597778
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2065,76.58638
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2070,68.927742
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2075,62.0349678
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2080,55.83147102
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2085,50.24832392
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2090,45.22349153
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2095,40.70114238
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2100,36.63102814
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2030,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2035,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2040,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2045,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2050,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2055,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2060,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2065,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2070,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2075,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2080,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2085,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2090,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2095,66.40625
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2100,66.40625
 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2000,10
 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2005,30
 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2010,60
diff --git a/data/country_groups.csv b/data/country_groups.csv
index 09a1a752bbec5426314ce3c2d40041335662409a..7720856fbad0d7203090467c8833c69d4e5112e1 100644
--- a/data/country_groups.csv
+++ b/data/country_groups.csv
@@ -54,9 +54,6 @@ Switzerland,7.824909,Europe & Central Asia,High income: OECD,Germany Austria & S
 Austria,8.363404,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
 Germany,81.77693,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
 Italy,59.277417,Europe & Central Asia,High income: OECD,Italy
-Estonia,1.331475,Europe & Central Asia,High income: OECD,Other former USSR
-Latvia,2.097555,Europe & Central Asia,High income: nonOECD,Other former USSR
-Lithuania,3.097282,Europe & Central Asia,High income: nonOECD,Other former USSR
 Georgia,3.926,Europe & Central Asia,Lower middle income,Other former USSR
 Turkmenistan,5.041995,Europe & Central Asia,Upper middle income,Other former USSR
 Kyrgyzstan,5.4479,Europe & Central Asia,Low income,Other former USSR
@@ -65,7 +62,10 @@ Azerbaijan,9.054332,Europe & Central Asia,Upper middle income,Other former USSR
 Belarus,9.49,Europe & Central Asia,Upper middle income,Other former USSR
 Kazakhstan,16.321581,Europe & Central Asia,Upper middle income,Other former USSR
 Uzbekistan,28.5624,Europe & Central Asia,Lower middle income,Other former USSR
-Poland,38.042794,Europe & Central Asia,High income: OECD,Poland
+Poland,38.042794,Europe & Central Asia,High income: OECD,Poland & Baltic states
+Estonia,1.331475,Europe & Central Asia,High income: OECD,Poland & Baltic states
+Latvia,2.097555,Europe & Central Asia,High income: nonOECD,Poland & Baltic states
+Lithuania,3.097282,Europe & Central Asia,High income: nonOECD,Poland & Baltic states
 Russian Federation,142.849449,Europe & Central Asia,High income: nonOECD,Russian Federation
 Greenland,0.056905,Europe & Central Asia,High income: nonOECD,Scandinavia
 Iceland,0.318041,Europe & Central Asia,High income: OECD,Scandinavia
@@ -191,4 +191,4 @@ Burkina Faso,15.632066,Sub-Saharan Africa,Low income,West Africa
 Niger,16.29199,Sub-Saharan Africa,Low income,West Africa
 Cote d'Ivoire,20.131707,Sub-Saharan Africa,Lower middle income,West Africa
 Ghana,24.317734,Sub-Saharan Africa,Lower middle income,West Africa
-Somalia,,Sub-Saharan Africa,,West Africa
\ No newline at end of file
+Somalia,,Sub-Saharan Africa,,West Africa
diff --git a/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java b/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
index ea1a48aeff1e2e045b384963c8b63a553aef471f..af97ad52a0c3e37536e6c6888784d3cf21280ff8 100644
--- a/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
+++ b/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
@@ -344,7 +344,9 @@ public class GamsLocationOptimiser {
 			cropUsageData.put(meatTypes, new CropUsageData(0.0, netImport, prod, Double.NaN));
 			if (DEBUG) LogWriter.println(String.format("\n%s:\t\t\t\t\tnetImports= %.3f,\tprod= %.3f", meatTypes.getGamsName(), netImport, prod)); 
 		}
-		LogWriter.println(String.format("\nTotal area= %.1f (crop=%.1f, pasture %.1f)", totalCropArea+totalPastureArea, totalCropArea, totalPastureArea));
+		LogWriter.println(String.format("\n%s %s: Total area= %.1f (crop=%.1f, pasture %.1f)", 
+				inputData.getCountryInput().getCountry(), inputData.getTimestep().getYear(), 
+				totalCropArea+totalPastureArea, totalCropArea, totalPastureArea));
 
 		GamsLocationOutput results = new GamsLocationOutput(modelStatus, landUses, cropUsageData, cropAdjs);
 		return results;