diff --git a/kratos.gid/apps/GeoMechanics/xml/Conditions.xml b/kratos.gid/apps/GeoMechanics/xml/Conditions.xml
index 582e496e6..6a0ea7c68 100644
--- a/kratos.gid/apps/GeoMechanics/xml/Conditions.xml
+++ b/kratos.gid/apps/GeoMechanics/xml/Conditions.xml
@@ -1,39 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ConditionList>
-
-  <ConditionItem n="NewCondition2D" pn="New condition" Interval="Total"
+  
+  <!-- Should this be moved to Nodal Conditions?-->
+  <ConditionItem n="Excavation" pn="Excavation" Interval="False"
 		 ImplementedInApplication="GeoMechanicsApplication" MinimumKratosVersion="9000"
-		 WorkingSpaceDimension="2D" LocalSpaceDimension="0" RequiresLocalAxes="False"
-		 ElementType="Line"  ProcessName="MyCustomProcess" VariableName="VOLUME_ACCELERATION"
-		 help="Self weight application by means of the AssignVectorByDirectionProcess in the core" units="m/s^2" unit_magnitude="Acceleration" Water="True">
+		 WorkingSpaceDimension="2D" LocalSpaceDimension="2D" RequiresLocalAxes="False"
+		 ElementType="Surface"  ProcessName="apply_excavation_process" VariableName="EXCAVATION"
+		 help="Apply this over the excavated surface" units="" unit_magnitude="" Water="False">
     <TopologyFeatures>
-      <item  GeometryType="Line" nodes="2" KratosName="Condition2D2N" KratosNameSmallDisplacement="Condition2D2N"/>
+      <item  GeometryType="Triangle" nodes="3" KratosName="Triangle2D3"/>
+      <item  GeometryType="Triangle" nodes="6" KratosName="Triangle2D6"/>
     </TopologyFeatures>
     <inputs>
     </inputs>
     <DefaultValues>
-	  <value n="modulus" pn="Modulus" v="9.81" />
-	  <value n="direction" v="0.0,-1.0,0.0" />
     </DefaultValues>
     <outputs>
-      <parameter n="FORCE" pn="External Load" v="false"/>
     </outputs>
   </ConditionItem>
+
   
-  <ConditionItem n="Excavation" pn="Excavation" Interval="False"
+  <ConditionItem n="WaterPressure2D" pn="Water pressure" Interval="False"
 		 ImplementedInApplication="GeoMechanicsApplication" MinimumKratosVersion="9000"
-		 WorkingSpaceDimension="2D" LocalSpaceDimension="2D" RequiresLocalAxes="False"
-		 ElementType="Surface"  ProcessName="apply_excavation_process" VariableName="EXCAVATION"
-		 help="Apply this over the excavated surface" units="" unit_magnitude="" Water="False">
+		 WorkingSpaceDimension="2D" LocalSpaceDimension="0" RequiresLocalAxes="False"
+		 ElementType="Line"  ProcessName="ApplyConstantBoundaryPhreaticLinePressureProcess" VariableName="NORMAL_CONTACT_STRESS"
+		 help="Self weight application by means of the AssignVectorByDirectionProcess in the core" units="m/s^2" unit_magnitude="Acceleration" Water="True">
     <TopologyFeatures>
-      <item  GeometryType="Triangle" nodes="3" KratosName="Triangle2D3"/>
-      <item  GeometryType="Triangle" nodes="6" KratosName="Triangle2D6"/>
+      <item  GeometryType="Line" nodes="2" KratosName="Condition2D2N" KratosNameSmallDisplacement="Condition2D2N"/>
+      <item  GeometryType="Line" nodes="3" KratosName="Condition2D3N" KratosNameSmallDisplacement="Condition2D3N"/>
     </TopologyFeatures>
     <inputs>
     </inputs>
     <DefaultValues>
     </DefaultValues>
     <outputs>
+      <parameter n="WATER_PRESSURE" pn="Water pressure" v="true"/>
     </outputs>
   </ConditionItem>
 
diff --git a/kratos.gid/apps/GeoMechanics/xml/Water.spd b/kratos.gid/apps/GeoMechanics/xml/Water.spd
index 132bbb386..2888775b1 100644
--- a/kratos.gid/apps/GeoMechanics/xml/Water.spd
+++ b/kratos.gid/apps/GeoMechanics/xml/Water.spd
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<container n="Water" pn="Water" un="GEOMWater" icon="wave16" open_window="0">
-	<container n="PhreaticPoints" pn="Phreatic line" icon="wave16">
+<container n="Water" pn="Water" un="GEOMWater" icon="wave16.png" open_window="0">
+    <dynamicnode command="spdAux::injectConditions" args="Water True"/>
+	<container n="PhreaticPoints" pn="Phreatic line" icon="wave16.png">
     </container>
 </container>