Index: DamEngine/branches/nwo_18.1/src/Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj
===================================================================
diff -u -r1848 -r3398
--- DamEngine/branches/nwo_18.1/src/Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj	(.../Deltares.DamEngine.ConsoleRun.csproj)	(revision 1848)
+++ DamEngine/branches/nwo_18.1/src/Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj	(.../Deltares.DamEngine.ConsoleRun.csproj)	(revision 3398)
@@ -11,6 +11,21 @@
     <AssemblyName>DamConsoleRun</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup />
   <ItemGroup>
@@ -43,6 +58,18 @@
       <Name>Deltares.DamEngine.Interface</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: DamEngine/branches/nwo_18.1/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs
===================================================================
diff -u -r2055 -r3398
--- DamEngine/branches/nwo_18.1/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs	(.../PlLinesCreator.cs)	(revision 2055)
+++ DamEngine/branches/nwo_18.1/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs	(.../PlLinesCreator.cs)	(revision 3398)
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Deltares.DamEngine.Calculators.General;
+using Deltares.DamEngine.Calculators.KernelWrappers.DamPipingSellmeijer4Forces;
 using Deltares.DamEngine.Calculators.Uplift;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Gauges;
@@ -1114,15 +1115,21 @@
                     intersectionPoint = new PlLinePoint(intersectionPoints2.First().X, intersectionPoints2.First().Z);
                 }
 
-
-                //// Handle making the NWO empty
                 if ((NWOPhreaticAdaption != null) && (NWOPhreaticAdaption == PhreaticAdaptionType.MakeEmpty))
                 {
-                    // for the polderside, the pl line is always allowed to be adapted. For the riverside, the pl line may only be adapted when the original waterlevel is runs through the nwo.
-                    RemoveAllWaterFromNonWaterRetainingObject(nwo1, pl1Line, nwo1Pl, nwo2Pl, nwo3Pl, nwo4Pl,
+                    SetWaterLevelAtPolderInNWO(nwo1,nwo4, pl1Line, nwo1Pl, nwo2Pl, nwo3Pl, nwo4Pl,
                         intersectionPoint, intersectionPoint2, plPointsToBeMoved);
                 }
 
+
+                //// Handle making the NWO empty
+//                if ((NWOPhreaticAdaption != null) && (NWOPhreaticAdaption == PhreaticAdaptionType.MakeEmpty))
+//                {
+//                    // for the polderside, the pl line is always allowed to be adapted. For the riverside, the pl line may only be adapted when the original waterlevel is runs through the nwo.
+//                    RemoveAllWaterFromNonWaterRetainingObject(nwo1, pl1Line, nwo1Pl, nwo2Pl, nwo3Pl, nwo4Pl,
+//                        intersectionPoint, intersectionPoint2, plPointsToBeMoved);
+//                }
+
                 //// Handle making the waterlevel horizontal in the NWO at the Riverside when needed (Polderside is already done when needed, see CreatePhreaticLineSegmentsInShoulderAndPolder.   
                 if ((NWOPhreaticAdaption != null) && (NWOPhreaticAdaption == PhreaticAdaptionType.None))
                 {
@@ -1261,6 +1268,96 @@
             }
         }
 
+
+
+        private void SetWaterLevelAtPolderInNWO(GeometryPoint nwo1, GeometryPoint nwo4, PlLine pl1Line,
+            PlLinePoint nwo1Pl,
+            PlLinePoint nwo2Pl, PlLinePoint nwo3Pl, PlLinePoint nwo4Pl, PlLinePoint intersection1,
+            PlLinePoint intersection2, IEnumerable<PlLinePoint> plPointsToBeMoved)
+        {
+            if ((nwo1.X >= this.surfaceLine.CharacteristicPoints
+                     .GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X) ||
+                ((intersection1 != null) && (intersection2 != null)))
+            {
+                // Move all the points in the pl line itself that need to be moved to below the surfaceline.
+                MoveSelectedPLLinePointsBelowSurfaceLine(plPointsToBeMoved);
+
+                // now add all extra points to the pl line 
+                if (nwo1Pl != null)
+                {
+                    PlLinePoint newP = pl1Line.EnsurePointAtX(nwo1Pl.X, GeometryPoint.Precision);
+                    newP.Z = nwo1Pl.Z;
+                }
+
+                if (nwo2Pl != null)
+                {
+                    PlLinePoint newP;
+
+
+                    if (nwo2Pl.Z < WaterLevelPolder)
+                    {
+                        double x = (nwo2Pl.X - nwo1.X) / (nwo2Pl.Z - (nwo1.Z - cOffsetPhreaticLineBelowSurface)) *
+                                   (WaterLevelPolder - (nwo1.Z - cOffsetPhreaticLineBelowSurface)) + nwo1.X;
+                        newP = pl1Line.EnsurePointAtX(x, GeometryPoint.Precision);
+                        newP.Z = WaterLevelPolder;
+                    }
+                    else
+                    {
+                        newP = pl1Line.EnsurePointAtX(nwo2Pl.X, GeometryPoint.Precision);
+                        newP.Z = nwo2Pl.Z;
+                    }
+
+                }
+
+                if (nwo3Pl != null)
+                {
+                    PlLinePoint newP;
+
+
+                    if (nwo3Pl.Z < WaterLevelPolder)
+                    {
+                        //                        double x = (nwo4.X - nwo3Pl.X) / ((nwo4.Z - cOffsetPhreaticLineBelowSurface) - nwo3Pl.Z ) *
+                        //                                   (WaterLevelPolder - nwo3Pl.Z) + nwo3Pl.X;
+                        //                        newP = pl1Line.EnsurePointAtX(x, GeometryPoint.Precision);
+                        //                        newP.Z = WaterLevelPolder;
+
+                        newP = pl1Line.EnsurePointAtX(nwo3Pl.X, GeometryPoint.Precision);
+                        newP.Z = WaterLevelPolder;
+                    }
+                    else
+                    {
+                        newP = pl1Line.EnsurePointAtX(nwo3Pl.X, GeometryPoint.Precision);
+                        newP.Z = nwo3Pl.Z;
+                    }
+                    
+                }
+
+                if (nwo4Pl != null)
+                    {
+                        var newP = pl1Line.EnsurePointAtX(nwo4Pl.X, GeometryPoint.Precision);
+                        newP.Z = nwo4Pl.Z;
+                    }
+
+                    // Note: for intersection points, apply offset in X direction not in Z.
+                    if (intersection1 != null)
+                    {
+                        var newP = pl1Line.EnsurePointAtX(intersection1.X - cOffsetPhreaticLineBelowSurface,
+                            GeometryPoint.Precision);
+                        newP.Z = intersection1.Z;
+                    }
+
+                    if (intersection2 != null)
+                    {
+                        var newP = pl1Line.EnsurePointAtX(intersection2.X + cOffsetPhreaticLineBelowSurface,
+                            GeometryPoint.Precision);
+                        newP.Z = intersection2.Z;
+                    }
+
+                    pl1Line.DeleteCoinsidingPoints(GeometryPoint.Precision);
+                }
+            }
+        
+
         private void RemoveAllWaterFromNonWaterRetainingObject(GeometryPoint nwo1, PlLine pl1Line, PlLinePoint nwo1Pl, PlLinePoint nwo2Pl, PlLinePoint nwo3Pl, PlLinePoint nwo4Pl, PlLinePoint intersection1, PlLinePoint intersection2, IEnumerable<PlLinePoint> plPointsToBeMoved)
         {
             if ((nwo1.X >= this.surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X) ||
Index: DamEngine/branches/nwo_18.1/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/PythonInterface.cs
===================================================================
diff -u -r2055 -r3398
--- DamEngine/branches/nwo_18.1/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/PythonInterface.cs	(.../PythonInterface.cs)	(revision 2055)
+++ DamEngine/branches/nwo_18.1/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/PythonInterface.cs	(.../PythonInterface.cs)	(revision 3398)
@@ -97,7 +97,7 @@
 
                    
 
-                    string pythonScriptName = PythonScriptsLocation+"//AddForbiddenLine.py";
+                    string pythonScriptName ='"'+ PythonScriptsLocation+"//AddForbiddenLine.py"+'"';
                     Process process = new Process();
                     process.StartInfo.FileName = PythonPath;
                     process.StartInfo.RedirectStandardOutput = true;
@@ -129,7 +129,7 @@
                 {
                     stiFileName = '"' + stiFileName + '"';
 
-                    string pythonScriptName = PythonScriptsLocation+ "//DefineXEntryMax.py";
+                    string pythonScriptName ='"'+ PythonScriptsLocation+ "//DefineXEntryMax.py"+'"';
                     Process process = new Process();
                     process.StartInfo.FileName = PythonPath;
                     process.StartInfo.RedirectStandardOutput = true;