Index: DamClients/DamUI/trunk/src/Dam/Data/LocationJob.cs
===================================================================
diff -u -r875 -r1284
--- DamClients/DamUI/trunk/src/Dam/Data/LocationJob.cs	(.../branches/CalcualtionIncluded/src/Dam/Data/LocationJob.cs)	(revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Data/LocationJob.cs	(.../trunk/src/Dam/Data/LocationJob.cs)	(revision 1284)
@@ -1,15 +1,26 @@
-//-----------------------------------------------------------------------
-// <copyright file="LocationJob.cs" company="Deltares">
-//  Copyright (c) 2009 Deltares. All rights reserved.
-// </copyright>
-// <author>Rob Brinkman</author>
-// <email>rob.brinkman@deltares.nl</email>
-// <date>16-2-2011</date>
-// <summary>n.a.</summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.Linq;
 using Deltares.Geographic;
 using Deltares.Standard.Attributes;
@@ -217,7 +228,7 @@
                     {
                         if (calculationResult.ProfileName == profileName &&
                             calculationResult.ScenarioName == scenarioName &&
-                            calculationResult.Calculation == calculationName)
+                            calculationResult.StabilityModel.ToString() == calculationName)
                             return calculationResult;
                     }                    
                 }                
Index: DamClients/DamUI/trunk/src/Dam/Data/CsvExportData.cs
===================================================================
diff -u -r1180 -r1284
--- DamClients/DamUI/trunk/src/Dam/Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 1180)
+++ DamClients/DamUI/trunk/src/Dam/Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 1284)
@@ -1621,7 +1621,6 @@
         [Unit(UnitType.None)]
         [PropertyOrder(2, 3)]
         [ReadOnly(true)]
-        [XmlIgnore]
         public MStabModelType? StabilityModel
         {
             get
@@ -2079,15 +2078,12 @@
 
         private string GetCurrentExeForOpenCalculationFile()
         {
-            //var exeName = StabilityCalculator.MStabExePath;
-            //if (SelectedStabilityKernelType != StabilityKernelType.DamClassic)
-            //{
-            //    exeName = Path.GetDirectoryName(exeName) + "\\MStab.exe";
-            //}
-            //return exeName;
-
-            //throw new NotImplementedException("To be implemented");
-            return "";
+            var exeName = DamHelperFunctions.MStabExePath;
+            if (SelectedStabilityKernelType != StabilityKernelType.DamClassic)
+            {
+                exeName = Path.GetDirectoryName(exeName) + "\\MStab.exe";
+            }
+            return exeName;
         }
 
         /// <summary>
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r1138 -r1284
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 1138)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 1284)
@@ -1028,7 +1028,7 @@
 
             this.locationJobSymbol.CurrentProfileName = result.ProfileName;
             this.locationJobSymbol.CurrentScenarioName = result.ScenarioName;
-            this.locationJobSymbol.CurrentCalculation = result.Calculation;
+            this.locationJobSymbol.CurrentCalculation = result.StabilityModel.ToString();
             var location = damProject.DamProjectData.Locations.Find(x => x.Name == lastDesignResult.LocationName);
             if (location != null)
             {