diff --git a/src/data_projection_access_routines.F90 b/src/data_projection_access_routines.F90
index 1d831ea5..04d94b93 100644
--- a/src/data_projection_access_routines.F90
+++ b/src/data_projection_access_routines.F90
@@ -62,10 +62,11 @@ MODULE DataProjectionAccessRoutines
   !> \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
   !>@{ 
   INTEGER(INTG), PARAMETER :: DATA_PROJECTION_CANCELLED=0 !<Data projection has been cancelled. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
-  INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_CONVERGED=1 !<Data projection exited due to it being converged \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
-  INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_BOUNDS=2 !<Data projection exited due to it hitting the bound and continue to travel out of the element. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
-  INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_MAX_ITERATION=3 !<Data projection exited due to it attaining maximum number of iteration specified by user. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
-  INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_NO_ELEMENT=4 !<Data projection exited due to no local element found, this happens when none of the candidate elements are within this computational node, and before MPI communication with other nodes. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
+  INTEGER(INTG), PARAMETER :: DATA_PROJECTION_USER_SPECIFIED=1 !<Data projection was specified by the user. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
+  INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_CONVERGED=2 !<Data projection exited due to it being converged \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
+  INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_BOUNDS=3 !<Data projection exited due to it hitting the bound and continue to travel out of the element. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
+  INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_MAX_ITERATION=4 !<Data projection exited due to it attaining maximum number of iteration specified by user. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
+  INTEGER(INTG), PARAMETER :: DATA_PROJECTION_EXIT_TAG_NO_ELEMENT=5 !<Data projection exited due to no local element found, this happens when none of the candidate elements are within this computational node, and before MPI communication with other nodes. \see DataProjectionRoutines,OPENCMISS_DataProjectionExitTags
   !>@}
 
   !Module types
@@ -74,8 +75,8 @@ MODULE DataProjectionAccessRoutines
 
   !Interfaces
 
-  PUBLIC DATA_PROJECTION_CANCELLED,DATA_PROJECTION_EXIT_TAG_CONVERGED,DATA_PROJECTION_EXIT_TAG_BOUNDS, &
-    & DATA_PROJECTION_EXIT_TAG_MAX_ITERATION,DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+  PUBLIC DATA_PROJECTION_CANCELLED,DATA_PROJECTION_USER_SPECIFIED,DATA_PROJECTION_EXIT_TAG_CONVERGED, &
+    & DATA_PROJECTION_EXIT_TAG_BOUNDS,DATA_PROJECTION_EXIT_TAG_MAX_ITERATION,DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
 
   PUBLIC DataProjection_DataPointsGet
 
diff --git a/src/data_projection_routines.F90 b/src/data_projection_routines.F90
index 8792f40f..74e72d63 100644
--- a/src/data_projection_routines.F90
+++ b/src/data_projection_routines.F90
@@ -26,7 +26,7 @@
 !> Auckland, the University of Oxford and King's College, London.
 !> All Rights Reserved.
 !>
-!> Contributor(s): Chris Bradley, Kumar Mithraratne, Xiani (Nancy) Yan, Prasad Babarenda Gamage
+!> Contributor(s): Chris Bradley, Tim Wu, Kumar Mithraratne, Xiani (Nancy) Yan, Prasad Babarenda Gamage
 !>
 !> Alternatively, the contents of this file may be used under the terms of
 !> either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -142,6 +142,8 @@ MODULE DataProjectionRoutines
   
   PUBLIC DataProjection_Destroy
   
+  PUBLIC DataProjection_DataPointFieldEvaluate
+  
   PUBLIC DataProjection_DataPointsProjectionEvaluate
 
   PUBLIC DataProjection_DataPointsPositionEvaluate
@@ -182,13 +184,19 @@ MODULE DataProjectionRoutines
   
   PUBLIC DataProjection_ResultDistanceGet
   
-  PUBLIC DataProjection_ResultElementNumberGet,DataProjection_ResultElementFaceNumberGet,DataProjection_ResultElementLineNumberGet
+  PUBLIC DataProjection_ResultElementNumberGet,DataProjection_ResultElementNumberSet
+  
+  PUBLIC DataProjection_ResultElementFaceNumberGet,DataProjection_ResultElementFaceNumberSet
   
+  PUBLIC DataProjection_ResultElementLineNumberGet,DataProjection_ResultElementLineNumberSet
+  
+  PUBLIC DataProjection_ResultElementXiGet
+ 
   PUBLIC DataProjection_ResultExitTagGet
 
   PUBLIC DataProjection_ResultProjectionVectorGet
   
-  PUBLIC DataProjection_ResultXiGet,DataProjection_ResultXiSet
+  PUBLIC DataProjection_ResultProjectionXiGet,DataProjection_ResultProjectionXiSet
 
   PUBLIC DataProjection_StartingXiGet,DataProjection_StartingXiSet
 
@@ -262,7 +270,7 @@ END SUBROUTINE DataProjection_AbsoluteToleranceSet
 
   !>Find the closest elements to a data point based on starting xi guess.
   SUBROUTINE DataProjection_ClosestElementsFind(dataProjection,interpolatedPoint,dataPointLocation,numberOfCandidates, &
-    & candidateElements,closestElements,closestDistances,err,error,*)
+    & candidateElements,closestElements,startingXi,closestDistances,err,error,*)
 
     !Argument variables
     TYPE(DataProjectionType), POINTER :: dataProjection !<Data projection problem to evaluate
@@ -271,6 +279,7 @@ SUBROUTINE DataProjection_ClosestElementsFind(dataProjection,interpolatedPoint,d
     INTEGER(INTG), INTENT(IN) :: numberOfCandidates !<The number of candidate elements.
     INTEGER(INTG), INTENT(IN) :: candidateElements(:) !<candidateElememnts(candidateIdx). The list of candidate elements for the projection.
     INTEGER(INTG), INTENT(OUT) :: closestElements(:) !<On exit, the list of element numbers with the shortest distances
+    REAL(DP), INTENT(IN) :: startingXi(:)
     REAL(DP), INTENT(OUT) :: closestDistances(:) !<On exit, the list of shortest distances (squared).
     INTEGER(INTG), INTENT(OUT) :: err !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
@@ -294,7 +303,7 @@ SUBROUTINE DataProjection_ClosestElementsFind(dataProjection,interpolatedPoint,d
       elementNumber=candidateElements(closestElementIdx)
       CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,elementNumber, &
         & interpolatedPoint%INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-      CALL Field_InterpolateXi(NO_PART_DERIV,dataProjection%startingXi,interpolatedPoint,err,error,*999, &
+      CALL Field_InterpolateXi(NO_PART_DERIV,startingXi,interpolatedPoint,err,error,*999, &
         & FIELD_GEOMETRIC_COMPONENTS_TYPE)
       distanceVector(1:numberOfCoordinates) = interpolatedPoint%values(:,1)-dataPointLocation
       distance2 = DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
@@ -317,7 +326,7 @@ SUBROUTINE DataProjection_ClosestElementsFind(dataProjection,interpolatedPoint,d
       elementNumber=candidateElements(closestElementIdx)
       CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,elementNumber, &
         & interpolatedPoint%INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-      CALL Field_InterpolateXi(NO_PART_DERIV,dataProjection%startingXi,interpolatedPoint,err,error,*999, &
+      CALL Field_InterpolateXi(NO_PART_DERIV,startingXi,interpolatedPoint,err,error,*999, &
         & FIELD_GEOMETRIC_COMPONENTS_TYPE) 
       distanceVector(1:numberOfCoordinates)=interpolatedPoint%values(:,1)-dataPointLocation
       distance2 = DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
@@ -352,7 +361,7 @@ END SUBROUTINE DataProjection_ClosestElementsFind
 
   !>Find the closest faces to a data point base on starting xi guess.
   SUBROUTINE DataProjection_ClosestFacesFind(dataProjection,interpolatedPoint,dataPointLocation,numberOfCandidates, &
-    & candidateElements,candidateElementFaces,closestElements,closestElementFaces,closestDistances,err,error,*)
+    & candidateElements,candidateElementFaces,startingXi,closestElements,closestElementFaces,closestDistances,err,error,*)
 
     !Argument variables
     TYPE(DataProjectionType), POINTER :: dataProjection !<Data projection problem to evaluate
@@ -361,6 +370,7 @@ SUBROUTINE DataProjection_ClosestFacesFind(dataProjection,interpolatedPoint,data
     INTEGER(INTG), INTENT(IN) :: numberOfCandidates !<The number of candidate elements.
     INTEGER(INTG), INTENT(IN) :: candidateElements(:) !<candidateElememnts(candidateIdx). The list of candidate elements for the projection.
     INTEGER(INTG), INTENT(IN) :: candidateElementFaces(:) !<candidateElementFaces(candidateIdx). The list of candidate faces for the projection.
+    REAL(DP), INTENT(IN) :: startingXi(:)
     INTEGER(INTG), INTENT(OUT) :: closestElements(:) !<On exit, the list of element numbers with the shortest distances
     INTEGER(INTG), INTENT(OUT) :: closestElementFaces(:) !<On exit, the list of face numbers with the shortest distances
     REAL(DP), INTENT(OUT) :: closestDistances(:) !<On exit, the list of shortest distances (squared).
@@ -389,7 +399,7 @@ SUBROUTINE DataProjection_ClosestFacesFind(dataProjection,interpolatedPoint,data
         & elementNumber)%ELEMENT_FACES(elementFaceNumber)
       CALL Field_InterpolationParametersFaceGet(dataProjection%projectionSetType,faceNumber,interpolatedPoint% &
         & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-      CALL Field_InterpolateXi(NO_PART_DERIV,dataProjection%startingXi,interpolatedPoint,err,error,*999, &
+      CALL Field_InterpolateXi(NO_PART_DERIV,startingXi,interpolatedPoint,err,error,*999, &
         & FIELD_GEOMETRIC_COMPONENTS_TYPE)
       distanceVector(1:numberOfCoordinates) = interpolatedPoint%values(:,1)-dataPointLocation
       distance2 = DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
@@ -417,7 +427,7 @@ SUBROUTINE DataProjection_ClosestFacesFind(dataProjection,interpolatedPoint,data
         & elementNumber)%ELEMENT_FACES(elementFaceNumber)          
       CALL Field_InterpolationParametersFaceGet(dataProjection%projectionSetType,faceNumber,interpolatedPoint% &
         & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-      CALL Field_InterpolateXi(NO_PART_DERIV,dataProjection%startingXi,interpolatedPoint,err,error,*999, &
+      CALL Field_InterpolateXi(NO_PART_DERIV,startingXi,interpolatedPoint,err,error,*999, &
         & FIELD_GEOMETRIC_COMPONENTS_TYPE) 
       distanceVector(1:numberOfCoordinates)=interpolatedPoint%values(:,1)-dataPointLocation
       distance2 = DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
@@ -455,7 +465,7 @@ END SUBROUTINE DataProjection_ClosestFacesFind
 
   !>Find the closest lines to a data point base on starting xi guess.
   SUBROUTINE DataProjection_ClosestLinesFind(dataProjection,interpolatedPoint,dataPointLocation,numberOfCandidates, &
-    & candidateElements,candidateElementLines,closestElements,closestElementLines,closestDistances,err,error,*)
+    & candidateElements,candidateElementLines,startingXi,closestElements,closestElementLines,closestDistances,err,error,*)
 
     !Argument variables
     TYPE(DataProjectionType), POINTER :: dataProjection !<Data projection problem to evaluate
@@ -464,6 +474,7 @@ SUBROUTINE DataProjection_ClosestLinesFind(dataProjection,interpolatedPoint,data
     INTEGER(INTG), INTENT(IN) :: numberOfCandidates !<The number of candidate elements.
     INTEGER(INTG), INTENT(IN) :: candidateElements(:) !<candidateElememnts(candidateIdx). The list of candidate elements for the projection.
     INTEGER(INTG), INTENT(IN) :: candidateElementLines(:) !<candidateElementLines(candidateIdx). The list of candidate lines for the projection.
+    REAL(DP), INTENT(IN) :: startingXi(:)
     INTEGER(INTG), INTENT(OUT) :: closestElements(:) !<On exit, the list of element numbers with the shortest distances
     INTEGER(INTG), INTENT(OUT) :: closestElementLines(:) !<On exit, the list of lines numbers with the shortest distances
     REAL(DP), INTENT(OUT) :: closestDistances(:) !<On exit, the list of shortest distances (squared).
@@ -492,7 +503,7 @@ SUBROUTINE DataProjection_ClosestLinesFind(dataProjection,interpolatedPoint,data
         & elementNumber)%ELEMENT_LINES(elementLineNumber)
       CALL Field_InterpolationParametersLineGet(dataProjection%projectionSetType,lineNumber,interpolatedPoint% &
         & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-      CALL Field_InterpolateXi(NO_PART_DERIV,dataProjection%startingXi,interpolatedPoint,err,error,*999, &
+      CALL Field_InterpolateXi(NO_PART_DERIV,startingXi,interpolatedPoint,err,error,*999, &
         & FIELD_GEOMETRIC_COMPONENTS_TYPE)
       distanceVector(1:numberOfCoordinates) = interpolatedPoint%values(:,1)-dataPointLocation
       distance2 = DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
@@ -520,7 +531,7 @@ SUBROUTINE DataProjection_ClosestLinesFind(dataProjection,interpolatedPoint,data
         & elementNumber)%ELEMENT_LINES(elementLineNumber)          
       CALL Field_InterpolationParametersLineGet(dataProjection%projectionSetType,lineNumber,interpolatedPoint% &
         & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-      CALL Field_InterpolateXi(NO_PART_DERIV,dataProjection%startingXi,interpolatedPoint,err,error,*999, &
+      CALL Field_InterpolateXi(NO_PART_DERIV,startingXi,interpolatedPoint,err,error,*999, &
         & FIELD_GEOMETRIC_COMPONENTS_TYPE) 
       distanceVector(1:numberOfCoordinates)=interpolatedPoint%values(:,1)-dataPointLocation 
       distance2 = DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
@@ -696,7 +707,7 @@ SUBROUTINE DataProjection_CreateStart(dataProjectionUserNumber,dataPoints,projec
           & " is invalid. The number of directions should be >=1 and <= 3."
         CALL FlagError(localError,err,error,*999)
       END SELECT
-      ALLOCATE(dataProjection%startingXi(dataProjection%numberOfXi),STAT=err)
+      ALLOCATE(dataProjection%startingXi(dataProjection%datapoints%numberOfDatapoints,dataProjection%numberOfXi),STAT=err)
       IF(err/=0) CALL FlagError("Could not allocate data points data projection starting xi.",err,error,*999)
       dataProjection%startingXi=0.5_DP !<initialised to 0.5 in each xi direction
       CALL DataProjection_DataProjectionCandidatesInitialise(dataProjection,err,error,*999)
@@ -893,6 +904,35 @@ END SUBROUTINE DataProjection_DataProjectionCandidatesInitialise
   !================================================================================================================================
   !
   
+  !>Cancels a data projection result
+  SUBROUTINE DataProjection_DataProjectionResultCancel(dataProjectionResult,err,error,*)
+
+    !Argument variables
+    TYPE(DataProjectionResultType) :: dataProjectionResult !<The data projection result to cancel 
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code
+    TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
+    !Local Variables
+    
+    ENTERS("DataProjection_DataProjectionResultCancel",err,error,*999)
+
+    CALL DataProjection_DataProjectionResultInitialise(dataProjectionResult,err,error,*999)
+    dataProjectionResult%exitTag=DATA_PROJECTION_CANCELLED
+    IF(ALLOCATED(dataProjectionResult%xi)) dataProjectionResult%xi=0.0_DP
+    IF(ALLOCATED(dataProjectionResult%elementXi)) dataProjectionResult%elementXi=0.0_DP
+    IF(ALLOCATED(dataProjectionResult%projectionVector)) dataProjectionResult%projectionVector=0.0_DP  
+    
+    EXITS("DataProjection_DataProjectionResultCancel")
+    RETURN
+999 ERRORS("DataProjection_DataProjectionResultCancel",err,error)
+    EXITS("DataProjection_DataProjectionResultCancel")
+    RETURN 1
+
+  END SUBROUTINE DataProjection_DataProjectionResultCancel
+  
+  !
+  !================================================================================================================================
+  !
+  
   !>Finalises the data projection result and deallocates all memory
   SUBROUTINE DataProjection_DataProjectionResultFinalise(dataProjectionResult,err,error,*)
 
@@ -906,7 +946,8 @@ SUBROUTINE DataProjection_DataProjectionResultFinalise(dataProjectionResult,err,
 
     dataProjectionResult%userNumber=0
     dataProjectionResult%distance=0.0
-    dataProjectionResult%elementNumber=0
+    dataProjectionResult%elementLocalNumber=0
+    dataProjectionResult%elementGlobalNumber=0
     dataProjectionResult%elementLineFaceNumber=0
     dataProjectionResult%exitTag=0
     IF(ALLOCATED(dataProjectionResult%xi)) DEALLOCATE(dataProjectionResult%xi)
@@ -938,7 +979,8 @@ SUBROUTINE DataProjection_DataProjectionResultInitialise(dataProjectionResult,er
 
     dataProjectionResult%userNumber=0
     dataProjectionResult%distance=0.0_DP
-    dataProjectionResult%elementNumber=0
+    dataProjectionResult%elementLocalNumber=0
+    dataProjectionResult%elementGlobalNumber=0
     dataProjectionResult%elementLineFaceNumber=0
     dataProjectionResult%exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
     
@@ -1034,7 +1076,7 @@ SUBROUTINE DataProjection_DataProjectionResultsInitialise(dataProjection,err,err
         CALL FlagError(localError,err,error,*999)
       ENDIF
       dataProjection%dataProjectionResults(dataPointIdx)%xi(1:dataProjection%numberOfXi)= &
-        & dataProjection%startingXi(1:dataProjection%numberOfXi)
+        & dataProjection%startingXi(dataPointIdx,1:dataProjection%numberOfXi)
       dataProjection%dataProjectionResults(dataPointIdx)%elementXi=0.0_DP
       dataProjection%dataProjectionResults(dataPointIdx)%projectionVector(1:dataProjection%numberOfCoordinates)=0.0_DP
     ENDDO !dataPointIdx
@@ -1290,6 +1332,79 @@ SUBROUTINE DataProjection_Initialise(dataProjection,err,error,*)
     
   END SUBROUTINE DataProjection_Initialise
   
+  !
+  !================================================================================================================================
+  !
+  
+  !>Evaluate the data point in a field based on data projection
+  SUBROUTINE DataProjection_DataPointFieldEvaluate(dataProjection,field,fieldVariableType,fieldParameterSetType, &
+    & dataPointUserNumber,fieldResult,err,error,*)
+
+    !Argument variables
+    TYPE(DataProjectionType), POINTER :: dataProjection !<Data projection to give the xi locations and element number for the data points
+    TYPE(FIELD_TYPE), POINTER :: field !<A pointer to the field to be interpolated
+    INTEGER(INTG), INTENT(IN) :: fieldVariableType !<The field variable type to be interpolated
+    INTEGER(INTG), INTENT(IN) :: fieldParameterSetType !<The parameter set to be interpolated
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The data point user number to evaluate
+    REAL(DP), INTENT(OUT) :: fieldResult(:) !<On exit, the field interpolated at the data point.
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code
+    TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
+    !Local Variables
+    INTEGER(INTG) :: dataPointGlobalNumber,elementNumber,coordinateIdx
+    TYPE(DataPointsType), POINTER :: dataPoints
+    TYPE(FIELD_INTERPOLATED_POINT_PTR_TYPE), POINTER :: interpolatedPoints(:)
+    TYPE(FIELD_INTERPOLATED_POINT_TYPE), POINTER :: interpolatedPoint
+    TYPE(FIELD_INTERPOLATION_PARAMETERS_PTR_TYPE), POINTER :: interpolationParameters(:)
+    TYPE(FIELD_PARAMETER_SET_TYPE), POINTER :: fieldParameterSet
+    TYPE(FIELD_VARIABLE_TYPE), POINTER :: fieldVariable
+    TYPE(VARYING_STRING) :: localError
+    
+    ENTERS("DataProjection_DataPointFieldEvaluate",err,error,*999)
+    
+    IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
+    IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
+    IF(.NOT.dataProjection%dataProjectionProjected) CALL FlagError("Data projection has not been evaluated.",err,error,*999)
+    IF(.NOT.ALLOCATED(dataProjection%dataProjectionResults)) &
+       CALL FlagError("Data projection projection results is not allocated.",err,error,*999)
+    NULLIFY(dataPoints)
+    CALL DataProjection_DataPointsGet(dataProjection,dataPoints,err,error,*999)
+    IF(.NOT.ASSOCIATED(field)) CALL FlagError("Field is not associated.",err,error,*999)
+    NULLIFY(fieldVariable)
+    CALL Field_VariableGet(field,fieldVariableType,fieldVariable,err,error,*999)
+    NULLIFY(fieldParameterSet)
+    CALL FieldVariable_ParameterSetGet(fieldVariable,fieldParameterSetType,fieldParameterSet,err,error,*999)
+    IF(SIZE(fieldResult,1)<fieldVariable%NUMBER_OF_COMPONENTS) THEN
+      localError="The size of the supplied field result array is too small for all field components. The size needs to be >= "// &
+        & TRIM(NumberToVString(fieldVariable%NUMBER_OF_COMPONENTS,"*",err,error))//"."
+      CALL FlagError(localError,err,error,*999)
+    ENDIF
+    CALL DataProjection_DataPointGlobalNumberGet(dataProjection,dataPointUserNumber,dataPointGlobalNumber,err,error,*999)
+    
+    NULLIFY(interpolatedPoints)
+    NULLIFY(interpolationParameters)
+    CALL Field_InterpolationParametersInitialise(field,interpolationParameters,err,error,*999)
+    CALL Field_InterpolatedPointsInitialise(interpolationParameters,interpolatedPoints,err,error,*999)
+    interpolatedPoint=>interpolatedPoints(fieldVariableType)%ptr
+    
+    elementNumber=dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementLocalNumber
+    CALL Field_InterpolationParametersElementGet(fieldParameterSetType,elementNumber, &
+      & interpolationParameters(fieldVariableType)%ptr,err,error,*999)
+    CALL Field_InterpolateXi(NO_PART_DERIV,dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementXi, &
+      & interpolatedPoint,err,error,*999)
+    DO coordinateIdx=1,fieldVariable%NUMBER_OF_COMPONENTS
+      fieldResult(coordinateIdx)=interpolatedPoint%values(coordinateIdx,NO_PART_DERIV)
+    ENDDO !coordinateIdx     
+    
+    CALL Field_InterpolatedPointsFinalise(interpolatedPoints,err,error,*999)
+    CALL Field_InterpolationParametersFinalise(interpolationParameters,err,error,*999)
+    
+    EXITS("DataProjection_DataPointFieldEvaluate")
+    RETURN
+999 ERRORSEXITS("DataProjection_DataPointFieldEvaluate",err,error)    
+    RETURN 1
+
+  END SUBROUTINE DataProjection_DataPointFieldEvaluate
+  
   !
   !================================================================================================================================
   !  
@@ -1372,7 +1487,7 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
     INTEGER(INTG), ALLOCATABLE :: globalNumberOfProjectedPoints(:)
     INTEGER(INTG) :: MPIClosestDistances,dataProjectionGlobalNumber
     INTEGER(INTG) :: MPIIError
-    INTEGER(INTG), ALLOCATABLE :: projectedElement(:),projectedLineFace(:),projectionExitTag(:)
+    INTEGER(INTG), ALLOCATABLE :: projectedGlobalElement(:),projectedLineFace(:),projectedLocalElement(:),projectionExitTag(:)
     REAL(DP), ALLOCATABLE :: closestDistances(:,:),globalClosestDistances(:,:)
     REAL(DP), ALLOCATABLE :: projectedDistance(:,:),projectedXi(:,:),projectionVectors(:,:)   
     INTEGER(INTG) :: elementIdx,elementNumber,lineFaceIdx,lineFaceNumber,computationalNodeIdx,xiIdx,localElementNumber, &
@@ -1582,6 +1697,7 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
     !find the clostest elements/faces/lines for each point in the current computational node base on starting xi
     !the clostest elements/faces/lines are required to shrink down on the list of possible projection candiates
     numberOfClosestCandidates=MIN(dataProjection%numberOfClosestElements,dataProjection%maxNumberOfCandidates)
+    numberOfClosestCandidates=dataProjection%maxNumberOfCandidates
     !Allocated and store he information for each data point. The information has to be stored in the corresponding
     !rows for them to be contiguous in memory for easy MPI access
     ALLOCATE(closestElements(numberOfDataPoints,numberOfClosestCandidates),STAT=err)
@@ -1608,12 +1724,14 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
             & dataPoints%dataPoints(dataPointIdx)%position,dataNumberOfCandidates,dataProjection% &
             & dataProjectionCandidates(dataPointIdx)%candidateElementNumbers, &
             & dataProjection%dataProjectionCandidates(dataPointIdx)%localFaceLineNumbers, &
+            & dataProjection%startingXi(dataPointIdx,:), &
             & closestElements(dataPointIdx,:),closestLinesFaces(dataPointIdx,:), &
             & closestDistances(dataPointIdx,:),err,error,*999)
         ELSE
           CALL DataProjection_ClosestLinesFind(dataProjection,interpolatedPoint, &
             & dataPoints%dataPoints(dataPointIdx)%position,numberOfCandidates,candidateElements, &
-            & candidateLinesFaces,closestElements(dataPointIdx,:),closestLinesFaces(dataPointIdx,:), &
+            & candidateLinesFaces,dataProjection%startingXi(dataPointIdx,:), &
+            & closestElements(dataPointIdx,:),closestLinesFaces(dataPointIdx,:), &
             & closestDistances(dataPointIdx,:),err,error,*999)
         ENDIF
       ENDDO !dataPointIdx
@@ -1627,13 +1745,14 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
             & dataPoints%dataPoints(dataPointIdx)%position,dataNumberOfCandidates,dataProjection% &
             & dataProjectionCandidates(dataPointIdx)%candidateElementNumbers, &
             & dataProjection%dataProjectionCandidates(dataPointIdx)%localFaceLineNumbers, &
+            & dataProjection%startingXi(dataPointIdx,:), &
             & closestElements(dataPointIdx,:),closestLinesFaces(dataPointIdx,:), &
             & closestDistances(dataPointIdx,:),err,error,*999)
         ELSE
           CALL DataProjection_ClosestFacesFind(dataProjection,interpolatedPoint, &
             & dataPoints%dataPoints(dataPointIdx)%position,numberOfCandidates,candidateElements, &
-            & candidateLinesFaces,closestElements(dataPointIdx,:),closestLinesFaces(dataPointIdx,:), &
-            & closestDistances(dataPointIdx,:),err,error,*999)
+            & candidateLinesFaces,dataProjection%startingXi(dataPointIdx,:),closestElements(dataPointIdx,:), &
+            & closestLinesFaces(dataPointIdx,:),closestDistances(dataPointIdx,:),err,error,*999)
         ENDIF
       ENDDO !dataPointIdx
     CASE(DATA_PROJECTION_ALL_ELEMENTS_PROJECTION_TYPE)
@@ -1644,11 +1763,13 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
           CALL DataProjection_ClosestElementsFind(dataProjection,interpolatedPoint, &
             & dataPoints%dataPoints(dataPointIdx)%position,dataNumberOfCandidates, &
             & dataProjection%dataProjectionCandidates(dataPointIdx)%candidateElementNumbers, &
-            & closestElements(dataPointIdx,:),closestDistances(dataPointIdx,:),err,error,*999)
+            & closestElements(dataPointIdx,:),dataProjection%startingXi(dataPointIdx,:),closestDistances(dataPointIdx,:),&
+            & err,error,*999)
         ELSE
           CALL DataProjection_ClosestElementsFind(dataProjection,interpolatedPoint, &
             & dataPoints%dataPoints(dataPointIdx)%position,numberOfCandidates,candidateElements, &
-            & closestElements(dataPointIdx,:),closestDistances(dataPointIdx,:),err,error,*999)
+            & closestElements(dataPointIdx,:),dataProjection%startingXi(dataPointIdx,:),closestDistances(dataPointIdx,:),&
+            & err,error,*999)
         ENDIF
       ENDDO !dataPointIdx
     CASE DEFAULT
@@ -1673,8 +1794,10 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
       IF(err/=0) CALL FlagError("Could not allocate all number of projected points.",err,error,*999)
       ALLOCATE(projectionExitTag(numberOfDataPoints),STAT=err)
       IF(err/=0) CALL FlagError("Could not allocate projected.",err,error,*999)
-      ALLOCATE(projectedElement(numberOfDataPoints),STAT=err)
-      IF(err/=0) CALL FlagError("Could not allocate projected element.",err,error,*999)
+      ALLOCATE(projectedLocalElement(numberOfDataPoints),STAT=err)
+      IF(err/=0) CALL FlagError("Could not allocate projected local element.",err,error,*999)
+      ALLOCATE(projectedGlobalElement(numberOfDataPoints),STAT=err)
+      IF(err/=0) CALL FlagError("Could not allocate projected global element.",err,error,*999)
       IF(boundaryProjection) THEN
         ALLOCATE(projectedLineFace(numberOfDataPoints),STAT=err)
         IF(err/=0) CALL FlagError("Could not allocate projected sub element.",err,error,*999)
@@ -1724,6 +1847,8 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
       projectedDistance(2,:)=myComputationalNode
       !Find the globally closest distance in the current domain
       DO dataPointIdx=1,numberOfDataPoints
+        projectionExitTag(dataPointIdx)=dataProjection%dataProjectionResults(dataPointIdx)%exitTag
+        projectedLocalElement(dataPointIdx)=dataProjection%dataProjectionResults(dataPointIdx)%elementLocalNumber
         CALL Sorting_BubbleIndexSort(globalClosestDistances(dataPointIdx,:),sortingIndices1,err,error,*999)
         sortingIndices1(1:totalNumberOfClosestCandidates)=sortingIndices1(1:totalNumberOfClosestCandidates)- &
           & globalMPIDisplacements(myComputationalNode+1) !shift the index to current computational node
@@ -1743,30 +1868,32 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
         !Newton project to closest lines, and find miminum projection
         DO dataPointIdx=1,numberOfDataPoints
           numberOfClosestCandidates=globalToLocalNumberOfClosestCandidates(dataPointIdx)
-          IF(numberOfClosestCandidates>0) THEN 
+          IF(numberOfClosestCandidates>0) THEN
+            projectedXi(:,dataPointIdx) = dataProjection%startingXi(dataPointIdx,:)
             CALL DataProjection_NewtonLinesEvaluate(dataProjection,interpolatedPoint, &
               & dataPoints%dataPoints(dataPointIdx)%position,closestElements( &
               & dataPointIdx,1:numberOfClosestCandidates),closestLinesFaces(dataPointIdx,1: &
-              & numberOfClosestCandidates),projectionExitTag(dataPointIdx),projectedElement(dataPointIdx),  &
+              & numberOfClosestCandidates),projectionExitTag(dataPointIdx),projectedLocalElement(dataPointIdx),  &
               & projectedLineFace(dataPointIdx),projectedDistance(1,dataPointIdx),projectedXi(:,dataPointIdx), &
               & projectionVectors(:,dataPointIdx),err,error,*999)
             !Map the element number to global number
-            projectedElement(dataPointIdx)=domainMappingElements%LOCAL_TO_GLOBAL_MAP(projectedElement(dataPointIdx))
+            projectedGlobalElement(dataPointIdx)=domainMappingElements%LOCAL_TO_GLOBAL_MAP(projectedLocalElement(dataPointIdx))
           ENDIF
         ENDDO !dataPointIdx
       CASE(DATA_PROJECTION_BOUNDARY_FACES_PROJECTION_TYPE)
         !Newton project to closest faces, and find miminum projection
         DO dataPointIdx=1,numberOfDataPoints
           numberOfClosestCandidates=globalToLocalNumberOfClosestCandidates(dataPointIdx)
-          IF(numberOfClosestCandidates>0) THEN 
+          IF(numberOfClosestCandidates>0) THEN
+            projectedXi(:,dataPointIdx) = dataProjection%startingXi(dataPointIdx,:)
             CALL DataProjection_NewtonFacesEvaluate(dataProjection,interpolatedPoint, &
               & dataPoints%dataPoints(dataPointIdx)%position,closestElements( &
               & dataPointIdx,1:numberOfClosestCandidates),closestLinesFaces(dataPointIdx, &
-              & 1:numberOfClosestCandidates),projectionExitTag(dataPointIdx),projectedElement(dataPointIdx), &
+              & 1:numberOfClosestCandidates),projectionExitTag(dataPointIdx),projectedLocalElement(dataPointIdx), &
               & projectedLineFace(dataPointIdx),projectedDistance(1,dataPointIdx),projectedXi(:,dataPointIdx), &
               & projectionVectors(:,dataPointIdx),err,error,*999)
             !Map the element number to global number
-            projectedElement(dataPointIdx)=domainMappingElements%LOCAL_TO_GLOBAL_MAP(projectedElement(dataPointIdx))
+            projectedGlobalElement(dataPointIdx)=domainMappingElements%LOCAL_TO_GLOBAL_MAP(projectedLocalElement(dataPointIdx))
           ENDIF
         ENDDO !dataPointIdx
       CASE(DATA_PROJECTION_ALL_ELEMENTS_PROJECTION_TYPE)
@@ -1775,41 +1902,44 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
         CASE(1) !1D element
           DO dataPointIdx=1,numberOfDataPoints
             numberOfClosestCandidates=globalToLocalNumberOfClosestCandidates(dataPointIdx)
-            IF(numberOfClosestCandidates>0) THEN 
+            IF(numberOfClosestCandidates>0) THEN
+              projectedXi(:,dataPointIdx) = dataProjection%startingXi(dataPointIdx,:)
               CALL DataProjection_NewtonElementsEvaluate_1(dataProjection,interpolatedPoint,dataPoints% &
                 & dataPoints(dataPointIdx)%position,closestElements(dataPointIdx, &
                 & 1:numberOfClosestCandidates),projectionExitTag(dataPointIdx), &
-                & projectedElement(dataPointIdx),projectedDistance(1,dataPointIdx), &
+                & projectedLocalElement(dataPointIdx),projectedDistance(1,dataPointIdx), &
                 & projectedXi(:,dataPointIdx),projectionVectors(:,dataPointIdx),err,error,*999)
               !Map the element number to global number
-              projectedElement(dataPointIdx)=domainMappingElements%LOCAL_TO_GLOBAL_MAP(projectedElement(dataPointIdx))
+              projectedGlobalElement(dataPointIdx)=domainMappingElements%LOCAL_TO_GLOBAL_MAP(projectedLocalElement(dataPointIdx))
             ENDIF
           ENDDO !dataPointIdx
         CASE(2) !2D element
           DO dataPointIdx=1,numberOfDataPoints
             numberOfClosestCandidates=globalToLocalNumberOfClosestCandidates(dataPointIdx)
-            IF(numberOfClosestCandidates>0) THEN 
+            IF(numberOfClosestCandidates>0) THEN
+              projectedXi(:,dataPointIdx) = dataProjection%startingXi(dataPointIdx,:)
               CALL DataProjection_NewtonElementsEvaluate_2(dataProjection,interpolatedPoint,dataPoints% &
                 & dataPoints(dataPointIdx)%position,closestElements(dataPointIdx, &
                 & 1:numberOfClosestCandidates),projectionExitTag(dataPointIdx), &
-                & projectedElement(dataPointIdx),projectedDistance(1,dataPointIdx), &
+                & projectedLocalElement(dataPointIdx),projectedDistance(1,dataPointIdx), &
                 & projectedXi(:,dataPointIdx),projectionVectors(:,dataPointIdx), &
                 & err,error,*999)
               !Map the element number to global number                        
-              projectedElement(dataPointIdx)=domainMappingElements%LOCAL_TO_GLOBAL_MAP(projectedElement(dataPointIdx))
+              projectedGlobalElement(dataPointIdx)=domainMappingElements%LOCAL_TO_GLOBAL_MAP(projectedLocalElement(dataPointIdx))
             ENDIF
           ENDDO !dataPointIdx
         CASE(3) !3D element
           DO dataPointIdx=1,numberOfDataPoints
             numberOfClosestCandidates=globalToLocalNumberOfClosestCandidates(dataPointIdx)
-            IF(numberOfClosestCandidates>0) THEN 
+            IF(numberOfClosestCandidates>0) THEN
+              projectedXi(:,dataPointIdx) = dataProjection%startingXi(dataPointIdx,:)
               CALL DataProjection_NewtonElementsEvaluate_3(dataProjection,interpolatedPoint,dataPoints% &
                 & dataPoints(dataPointIdx)%position,closestElements(dataPointIdx, &
                 & 1:numberOfClosestCandidates),projectionExitTag(dataPointIdx), &
-                & projectedElement(dataPointIdx),projectedDistance(1,dataPointIdx), &
+                & projectedLocalElement(dataPointIdx),projectedDistance(1,dataPointIdx), &
                 & projectedXi(:,dataPointIdx),projectionVectors(:,dataPointIdx),err,error,*999)
               !Map the element number to global number
-              projectedElement(dataPointIdx)=domainMappingElements%LOCAL_TO_GLOBAL_MAP(projectedElement(dataPointIdx))
+              projectedGlobalElement(dataPointIdx)=domainMappingElements%LOCAL_TO_GLOBAL_MAP(projectedLocalElement(dataPointIdx))
             ENDIF
           ENDDO !dataPointIdx
         CASE DEFAULT
@@ -1841,8 +1971,12 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
           & globalNumberOfProjectedPoints(computationalNodeIdx)
       ENDDO !computationalNodeIdx  
       !Shares minimum projection information between all domains
-      CALL MPI_ALLGATHERV(projectedElement(sortingIndices2(startIdx:finishIdx)),globalNumberOfProjectedPoints( &
-        & myComputationalNode+1),MPI_INTEGER,projectedElement,globalNumberOfProjectedPoints, &
+      CALL MPI_ALLGATHERV(projectedLocalElement(sortingIndices2(startIdx:finishIdx)),globalNumberOfProjectedPoints( &
+        & myComputationalNode+1),MPI_INTEGER,projectedLocalElement,globalNumberOfProjectedPoints, &
+        & globalMPIDisplacements,MPI_INTEGER,computationalEnvironment%mpiCommunicator,MPIIError) !projectedElement
+      CALL MPI_ERROR_CHECK("MPI_ALLGATHERV",MPIIError,err,error,*999)
+      CALL MPI_ALLGATHERV(projectedGlobalElement(sortingIndices2(startIdx:finishIdx)),globalNumberOfProjectedPoints( &
+        & myComputationalNode+1),MPI_INTEGER,projectedGlobalElement,globalNumberOfProjectedPoints, &
         & globalMPIDisplacements,MPI_INTEGER,computationalEnvironment%mpiCommunicator,MPIIError) !projectedElement
       CALL MPI_ERROR_CHECK("MPI_ALLGATHERV",MPIIError,err,error,*999)
       IF(boundaryProjection) THEN
@@ -1871,7 +2005,10 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
       !Assign projection information to projected points
       DO dataPointIdx=1,numberOfDataPoints
         dataProjection%dataProjectionResults(sortingIndices2(dataPointIdx))%exitTag=projectionExitTag(dataPointIdx)
-        dataProjection%dataProjectionResults(sortingIndices2(dataPointIdx))%elementNumber=projectedElement(dataPointIdx)
+        dataProjection%dataProjectionResults(sortingIndices2(dataPointIdx))%elementLocalNumber= &
+          & projectedLocalElement(dataPointIdx)
+        dataProjection%dataProjectionResults(sortingIndices2(dataPointIdx))%elementGlobalNumber= &
+          & projectedGlobalElement(dataPointIdx)
         dataProjection%dataProjectionResults(dataPointIdx)%DISTANCE=projectedDistance(1,dataPointIdx)
         dataProjection%dataProjectionResults(sortingIndices2(dataPointIdx))%xi(1:dataProjection%numberOfXi)= &
           & projectedXi(1:dataProjection%numberOfXi,dataPointIdx)
@@ -1880,7 +2017,8 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
       ENDDO !dataPointIdx
       projectedXi(:,sortingIndices2)=projectedXi
       projectionVectors(:, sortingIndices2)=projectionVectors
-      projectedElement(sortingIndices2)=projectedElement       
+      projectedLocalElement(sortingIndices2)=projectedLocalElement       
+      projectedGlobalElement(sortingIndices2)=projectedGlobalElement       
       IF(dataProjection%projectionType==DATA_PROJECTION_BOUNDARY_LINES_PROJECTION_TYPE) THEN
         DO dataPointIdx=1,numberOfDataPoints          
           dataProjection%dataProjectionResults(sortingIndices2(dataPointIdx))%elementLineFaceNumber=projectedLineFace(dataPointIdx)
@@ -1899,21 +2037,28 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
           CALL DataProjection_NewtonLinesEvaluate(dataProjection,interpolatedPoint,dataPoints%dataPoints( &
             & dataPointIdx)%position,closestElements(dataPointIdx,:),closestLinesFaces(dataPointIdx,:), &
             & dataProjection%dataProjectionResults(dataPointIdx)%exitTag,dataProjection% &
-            & dataProjectionResults(dataPointIdx)%elementNumber,dataProjection% &
+            & dataProjectionResults(dataPointIdx)%elementLocalNumber,dataProjection% &
             & dataProjectionResults(dataPointIdx)%elementLineFaceNumber,dataProjection%dataProjectionResults( &
-            & dataPointIdx)%DISTANCE,dataProjection%dataProjectionResults(dataPointIdx)%xi, &
+            & dataPointIdx)%distance,dataProjection%dataProjectionResults(dataPointIdx)%xi, &
             & dataProjection%dataProjectionResults(dataPointIdx)%projectionVector,err,error,*999)
+          dataProjection%dataProjectionResults(dataPointIdx)%elementGlobalNumber= &
+            & dataProjection%dataProjectionResults(dataPointIdx)%elementLocalNumber
         ENDDO !dataPointIdx
       CASE(DATA_PROJECTION_BOUNDARY_FACES_PROJECTION_TYPE) 
         !Newton project to closest faces, and find miminum projection
         DO dataPointIdx=1,numberOfDataPoints
+          !IF (dataPointIdx==132) THEN
+          !  WRITE(*,*) dataPointIdx
+          !ENDIF
           CALL DataProjection_NewtonFacesEvaluate(dataProjection,interpolatedPoint,dataPoints%dataPoints( &
             & dataPointIdx)%position,closestElements(dataPointIdx,:),closestLinesFaces(dataPointIdx,:), &
             & dataProjection%dataProjectionResults(dataPointIdx)%exitTag,dataProjection% &
-            & dataProjectionResults(dataPointIdx)%elementNumber,dataProjection% &
+            & dataProjectionResults(dataPointIdx)%elementLocalNumber,dataProjection% &
             & dataProjectionResults(dataPointIdx)%elementLineFaceNumber,dataProjection%dataProjectionResults( &
             & dataPointIdx)%DISTANCE,dataProjection%dataProjectionResults(dataPointIdx)%xi, &
             & dataProjection%dataProjectionResults(dataPointIdx)%projectionVector,err,error,*999)
+          dataProjection%dataProjectionResults(dataPointIdx)%elementGlobalNumber= &
+            & dataProjection%dataProjectionResults(dataPointIdx)%elementLocalNumber
         ENDDO !dataPointIdx
       CASE(DATA_PROJECTION_ALL_ELEMENTS_PROJECTION_TYPE)        
         !Newton project to closest elements, and find miminum projection
@@ -1923,30 +2068,36 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
             CALL DataProjection_NewtonElementsEvaluate_1(dataProjection,interpolatedPoint,dataPoints% &
               & dataPoints(dataPointIdx)%position,closestElements(dataPointIdx,:),dataProjection% &
               & dataProjectionResults(dataPointIdx)%exitTag,dataProjection%dataProjectionResults( &
-              & dataPointIdx)%elementNumber,dataProjection%dataProjectionResults(dataPointIdx)%distance, &
+              & dataPointIdx)%elementLocalNumber,dataProjection%dataProjectionResults(dataPointIdx)%distance, &
               & dataProjection%dataProjectionResults(dataPointIdx)%xi, &
               & dataProjection%dataProjectionResults(dataPointIdx)%projectionVector,&
               & err,error,*999)
-          ENDDO !dataPointIdx
+            dataProjection%dataProjectionResults(dataPointIdx)%elementGlobalNumber= &
+              & dataProjection%dataProjectionResults(dataPointIdx)%elementLocalNumber
+         ENDDO !dataPointIdx
         CASE(2) !2D mesh
           DO dataPointIdx=1,numberOfDataPoints
             CALL DataProjection_NewtonElementsEvaluate_2(dataProjection,interpolatedPoint,dataPoints% &
               & dataPoints(dataPointIdx)%position,closestElements(dataPointIdx,:),dataProjection% &
               & dataProjectionResults(dataPointIdx)%exitTag,dataProjection%dataProjectionResults( &
-              & dataPointIdx)%elementNumber,dataProjection%dataProjectionResults(dataPointIdx)%distance, &
+              & dataPointIdx)%elementLocalNumber,dataProjection%dataProjectionResults(dataPointIdx)%distance, &
               & dataProjection%dataProjectionResults(dataPointIdx)%xi, &
               & dataProjection%dataProjectionResults(dataPointIdx)%projectionVector, &
               & err,error,*999)
+            dataProjection%dataProjectionResults(dataPointIdx)%elementGlobalNumber= &
+              & dataProjection%dataProjectionResults(dataPointIdx)%elementLocalNumber
           ENDDO !dataPointIdx
         CASE(3) !3D mesh
           DO dataPointIdx=1,numberOfDataPoints
             CALL DataProjection_NewtonElementsEvaluate_3(dataProjection,interpolatedPoint,dataPoints% &
               & dataPoints(dataPointIdx)%position,closestElements(dataPointIdx,:),dataProjection% &
               & dataProjectionResults(dataPointIdx)%exitTag,dataProjection%dataProjectionResults( &
-              & dataPointIdx)%elementNumber,dataProjection%dataProjectionResults(dataPointIdx)%distance, &
+              & dataPointIdx)%elementLocalNumber,dataProjection%dataProjectionResults(dataPointIdx)%distance, &
               & dataProjection%dataProjectionResults(dataPointIdx)%xi, &
               & dataProjection%dataProjectionResults(dataPointIdx)%projectionVector, &
               & err,error,*999)
+            dataProjection%dataProjectionResults(dataPointIdx)%elementGlobalNumber= &
+              & dataProjection%dataProjectionResults(dataPointIdx)%elementLocalNumber
           ENDDO !dataPointIdx
         CASE DEFAULT
           localError="The data projection number of xi of "//TRIM(NumberToVString(dataProjection%numberOfXi,"*",err,error))// &
@@ -1967,7 +2118,7 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
       ENDDO !dataPointIdx
     ELSE
       DO dataPointIdx=1,numberOfDataPoints
-        elementNumber=dataProjection%dataProjectionResults(dataPointIdx)%elementNumber
+        elementNumber=dataProjection%dataProjectionResults(dataPointIdx)%elementLocalNumber
         localLineFaceNumber=dataProjection%dataProjectionResults(dataPointIdx)%elementLineFaceNumber
         basis=>domainElements%elements(elementNumber)%basis
         CALL Basis_BoundaryXiToXi(basis,localLineFaceNumber,dataProjection% &
@@ -1991,7 +2142,8 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
     IF(ALLOCATED(globalMPIDisplacements)) DEALLOCATE(globalMPIDisplacements)
     IF(ALLOCATED(globalNumberOfProjectedPoints)) DEALLOCATE(globalNumberOfProjectedPoints)
     IF(ALLOCATED(projectionExitTag)) DEALLOCATE(projectionExitTag)
-    IF(ALLOCATED(projectedElement)) DEALLOCATE(projectedElement)
+    IF(ALLOCATED(projectedLocalElement)) DEALLOCATE(projectedLocalElement)
+    IF(ALLOCATED(projectedGlobalElement)) DEALLOCATE(projectedGlobalElement)
     IF(ALLOCATED(projectedLineFace)) DEALLOCATE(projectedLineFace)
     IF(ALLOCATED(projectedDistance)) DEALLOCATE(projectedDistance)
     IF(ALLOCATED(projectedXi)) DEALLOCATE(projectedXi)
@@ -2012,7 +2164,8 @@ SUBROUTINE DataProjection_DataPointsProjectionEvaluate(dataProjection,projection
     IF(ALLOCATED(globalMPIDisplacements)) DEALLOCATE(globalMPIDisplacements)
     IF(ALLOCATED(globalNumberOfProjectedPoints)) DEALLOCATE(globalNumberOfProjectedPoints)
     IF(ALLOCATED(projectionExitTag)) DEALLOCATE(projectionExitTag)
-    IF(ALLOCATED(projectedElement)) DEALLOCATE(projectedElement)
+    IF(ALLOCATED(projectedLocalElement)) DEALLOCATE(projectedLocalElement)
+    IF(ALLOCATED(projectedGlobalElement)) DEALLOCATE(projectedGlobalElement)
     IF(ALLOCATED(projectedLineFace)) DEALLOCATE(projectedLineFace)
     IF(ALLOCATED(projectedDistance)) DEALLOCATE(projectedDistance)
     IF(ALLOCATED(projectedXi)) DEALLOCATE(projectedXi)
@@ -2072,7 +2225,7 @@ SUBROUTINE DataProjection_DataPointsPositionEvaluate(dataProjection,field,fieldV
     interpolatedPoint=>interpolatedPoints(fieldVariableType)%ptr
     !Loop through data points 
     DO dataPointIdx=1,dataPoints%numberOfDataPoints
-      elementNumber=dataProjection%dataProjectionResults(dataPointIdx)%elementNumber
+      elementNumber=dataProjection%dataProjectionResults(dataPointIdx)%elementLocalNumber
       CALL Field_InterpolationParametersElementGet(fieldParameterSetType,elementNumber, &
         & interpolationParameters(fieldVariableType)%ptr,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
       CALL Field_InterpolateXi(NO_PART_DERIV,dataProjection%dataProjectionResults(dataPointIdx)%xi, &
@@ -2230,7 +2383,7 @@ SUBROUTINE DataProjection_NewtonElementsEvaluate_1(dataProjection,interpolatedPo
     INTEGER(INTG), INTENT(OUT) :: projectionExitTag !<On exit, the exit tag status for the data point projection
     INTEGER(INTG), INTENT(OUT) :: projectionElementNumber !<On exit, the element number of the data point projection
     REAL(DP), INTENT(OUT) :: projectionDistance !<On exit, the projection distance
-    REAL(DP), INTENT(OUT) :: projectionXi(1) !<projectionXi(xiIdx). On exit, the xi location of the data point projection
+    REAL(DP), INTENT(INOUT) :: projectionXi(1) !<projectionXi(xiIdx). On exit, the xi location of the data point projection
     REAL(DP), INTENT(OUT) :: projectionVector(3) !<projectionVector(componentIdx). On exit, the projection vector for the data point projection
     INTEGER(INTG), INTENT(OUT) :: err !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string   
@@ -2253,118 +2406,128 @@ SUBROUTINE DataProjection_NewtonElementsEvaluate_1(dataProjection,interpolatedPo
     IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
     IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
     
-    projectionExitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
     numberOfCoordinates=dataProjection%numberOfCoordinates
-    relativeTolerance=dataProjection%relativeTolerance
-    absoluteTolerance=dataProjection%absoluteTolerance
-    maximumDelta=dataProjection%maximumIterationUpdate
-    minimumDelta=0.025_DP*maximumDelta !need to set a minimum, in case if it gets too small      
-    !Project on each candidate elements
-    DO elementIdx=1,SIZE(candidateElements,1) 
-      elementNumber=candidateElements(elementIdx)
-      IF(elementNumber>0) THEN
-        exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
-        converged=.FALSE.
-        !Start at half the maximumDelta as we do not know if quadratic model is a good approximation yet
-        delta=0.5_DP*maximumDelta 
-        CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,elementNumber,interpolatedPoint% &
-          & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-        xi=dataProjection%startingXi
-        CALL Field_InterpolateXi(SECOND_PART_DERIV,xi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-        distanceVector(1:numberOfCoordinates)=dataPointLocation-interpolatedPoint%values(:,NO_PART_DERIV)
-        functionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))       
-        main_loop: DO iterationIdx1=1,dataProjection%maximumNumberOfIterations !(outer loop)
-          !Check for bounds [0,1]
-          IF(ABS(xi(1))<ZERO_TOLERANCE) THEN
-            bound=-1 !bound at negative direction             
-          ELSEIF(ABS(xi(1)-1.0_DP)<ZERO_TOLERANCE) THEN
-            bound=1 !bound at positive direction
-          ELSE !inside the bounds
-            bound=0
-          ENDIF
-          !functionGradient 
-          functionGradient=-2.0_DP* &
-            & (DOT_PRODUCT(distanceVector(1:numberOfCoordinates),interpolatedPoint%values(:,FIRST_PART_DERIV)))
-          !functionHessian 
-          functionHessian=-2.0_DP* &
-            & (DOT_PRODUCT(distanceVector(1:numberOfCoordinates),interpolatedPoint%values(:,SECOND_PART_DERIV))- &
-            & DOT_PRODUCT(interpolatedPoint%values(:,FIRST_PART_DERIV),interpolatedPoint%values(:,FIRST_PART_DERIV)))
-          !A model trust region approach, directly taken from CMISS CLOS22: V = -(H + EIGEN_SHIFT*I)g
-          !The calculation of EIGEN_SHIFT are only approximated as opposed to the common trust region approach               
-          !(inner loop: adjust region size) usually EXIT at 1 or 2 iterations
-          DO iterationIdx2=1,dataProjection%maximumNumberOfIterations 
-            insideRegion=.FALSE.
-            IF(functionHessian>absoluteTolerance) THEN !positive: minimum exists
-              updateXi(1)=-functionGradient/functionHessian
-              updateXiNorm=DABS(updateXi(1))
-              insideRegion=updateXiNorm<=delta
-            ENDIF !positive                 
-            IF(.NOT.insideRegion) THEN !minimum not in the region
-              updateXi(1)=-DSIGN(delta,functionGradient)
-              updateXiNorm=delta
-            ENDIF
-            IF((bound/=0).AND.(bound>0.EQV.updateXi(1)>0.0_DP)) THEN !projection go out of element bound
-              exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
-              EXIT main_loop
-            ENDIF
-            converged=updateXiNorm<absoluteTolerance !first half of the convergence test (before collision detection)
-            newXi=xi+updateXi !update xi
-            IF(newXi(1)<0.0_DP) THEN !boundary collision check
-              newXi(1)=0.0_DP
-            ELSEIF(newXi(1)>1.0_DP) THEN
-              newXi(1)=1.0_DP  
+    IF(projectionExitTag==DATA_PROJECTION_USER_SPECIFIED) THEN
+      IF(projectionElementNumber==0) CALL FlagError("The projection element number has not been set.",err,error,*999)
+      CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,projectionElementNumber, &
+        & interpolatedPoint%INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+      CALL Field_InterpolateXi(NO_PART_DERIV,projectionXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+      projectionVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
+        & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+      projectionDistance=DSQRT(DOT_PRODUCT(projectionVector(1:numberOfCoordinates),projectionVector(1:numberOfCoordinates)))
+    ELSE
+      projectionExitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+      relativeTolerance=dataProjection%relativeTolerance
+      absoluteTolerance=dataProjection%absoluteTolerance
+      maximumDelta=dataProjection%maximumIterationUpdate
+      minimumDelta=0.025_DP*maximumDelta !need to set a minimum, in case if it gets too small      
+      !Project on each candidate elements
+      DO elementIdx=1,SIZE(candidateElements,1) 
+        elementNumber=candidateElements(elementIdx)
+        IF(elementNumber>0) THEN
+          exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+          converged=.FALSE.
+          !Start at half the maximumDelta as we do not know if quadratic model is a good approximation yet
+          delta=0.5_DP*maximumDelta 
+          CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,elementNumber,interpolatedPoint% &
+            & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+          xi=projectionXi
+          CALL Field_InterpolateXi(SECOND_PART_DERIV,xi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+          distanceVector(1:numberOfCoordinates)=dataPointLocation-interpolatedPoint%values(:,NO_PART_DERIV)
+          functionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))       
+          main_loop: DO iterationIdx1=1,dataProjection%maximumNumberOfIterations !(outer loop)
+            !Check for bounds [0,1]
+            IF(ABS(xi(1))<ZERO_TOLERANCE) THEN
+              bound=-1 !bound at negative direction             
+            ELSEIF(ABS(xi(1)-1.0_DP)<ZERO_TOLERANCE) THEN
+              bound=1 !bound at positive direction
+            ELSE !inside the bounds
+              bound=0
             ENDIF
-            CALL Field_InterpolateXi(SECOND_PART_DERIV,newXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-            distanceVector=dataPointLocation-interpolatedPoint%values(:,NO_PART_DERIV)
-            newFunctionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
-            !second half of the convergence test
-            converged=converged.AND.(DABS(newFunctionValue-functionValue)/(1.0_DP+functionValue)<relativeTolerance) 
-            IF(converged) EXIT !converged: exit inner loop first
-            IF((newFunctionValue-functionValue)>absoluteTolerance) THEN !bad model: reduce step size
-              IF(delta<=minimumDelta) THEN
-                !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
-                exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
+            !functionGradient 
+            functionGradient=-2.0_DP* &
+              & (DOT_PRODUCT(distanceVector(1:numberOfCoordinates),interpolatedPoint%values(:,FIRST_PART_DERIV)))
+            !functionHessian 
+            functionHessian=-2.0_DP* &
+              & (DOT_PRODUCT(distanceVector(1:numberOfCoordinates),interpolatedPoint%values(:,SECOND_PART_DERIV))- &
+              & DOT_PRODUCT(interpolatedPoint%values(:,FIRST_PART_DERIV),interpolatedPoint%values(:,FIRST_PART_DERIV)))
+            !A model trust region approach, directly taken from CMISS CLOS22: V = -(H + EIGEN_SHIFT*I)g
+            !The calculation of EIGEN_SHIFT are only approximated as opposed to the common trust region approach               
+            !(inner loop: adjust region size) usually EXIT at 1 or 2 iterations
+            DO iterationIdx2=1,dataProjection%maximumNumberOfIterations 
+              insideRegion=.FALSE.
+              IF(functionHessian>absoluteTolerance) THEN !positive: minimum exists
+                updateXi(1)=-functionGradient/functionHessian
+                updateXiNorm=DABS(updateXi(1))
+                insideRegion=updateXiNorm<=delta
+              ENDIF !positive                 
+              IF(.NOT.insideRegion) THEN !minimum not in the region
+                updateXi(1)=-DSIGN(delta,functionGradient)
+                updateXiNorm=delta
+              ENDIF
+              IF((bound/=0).AND.(bound>0.EQV.updateXi(1)>0.0_DP)) THEN !projection go out of element bound
+                exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
                 EXIT main_loop
               ENDIF
-              delta=DMAX1(minimumDelta,0.25_DP*delta)
-            ELSE
-              predictedReduction=updateXi(1)*(functionGradient+0.5_DP*functionHessian*updateXi(1))
-              predictionAccuracy=(newFunctionValue-functionValue)/predictedReduction
-              IF(predictionAccuracy<0.01_DP) THEN !bad model: reduce region size
+              converged=updateXiNorm<absoluteTolerance !first half of the convergence test (before collision detection)
+              newXi=xi+updateXi !update xi
+              IF(newXi(1)<0.0_DP) THEN !boundary collision check
+                newXi(1)=0.0_DP
+              ELSEIF(newXi(1)>1.0_DP) THEN
+                newXi(1)=1.0_DP  
+              ENDIF
+              CALL Field_InterpolateXi(SECOND_PART_DERIV,newXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+              distanceVector=dataPointLocation-interpolatedPoint%values(:,NO_PART_DERIV)
+              newFunctionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
+              !second half of the convergence test
+              converged=converged.AND.(DABS(newFunctionValue-functionValue)/(1.0_DP+functionValue)<relativeTolerance) 
+              IF(converged) EXIT !converged: exit inner loop first
+              IF((newFunctionValue-functionValue)>absoluteTolerance) THEN !bad model: reduce step size
                 IF(delta<=minimumDelta) THEN
                   !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
                   exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
                   EXIT main_loop
                 ENDIF
-                delta=DMAX1(minimumDelta,0.5_DP*delta)
-              ELSEIF(predictionAccuracy>0.9_DP.AND.predictionAccuracy<1.1_DP) THEN
-                !good model: increase region size
-                delta=DMIN1(maximumDelta,2.0_DP*delta)
-                EXIT
+                delta=DMAX1(minimumDelta,0.25_DP*delta)
               ELSE
-                !ok model: keep the current region size
-                EXIT
+                predictedReduction=updateXi(1)*(functionGradient+0.5_DP*functionHessian*updateXi(1))
+                predictionAccuracy=(newFunctionValue-functionValue)/predictedReduction
+                IF(predictionAccuracy<0.01_DP) THEN !bad model: reduce region size
+                  IF(delta<=minimumDelta) THEN
+                    !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
+                    exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
+                    EXIT main_loop
+                  ENDIF
+                  delta=DMAX1(minimumDelta,0.5_DP*delta)
+                ELSEIF(predictionAccuracy>0.9_DP.AND.predictionAccuracy<1.1_DP) THEN
+                  !good model: increase region size
+                  delta=DMIN1(maximumDelta,2.0_DP*delta)
+                  EXIT
+                ELSE
+                  !ok model: keep the current region size
+                  EXIT
+                ENDIF
               ENDIF
+            ENDDO !iterationIdx2 (inner loop: adjust region size)
+            functionValue=newFunctionValue
+            xi=newXi
+            IF(converged) THEN
+              exitTag=DATA_PROJECTION_EXIT_TAG_CONVERGED
+              EXIT
             ENDIF
-          ENDDO !iterationIdx2 (inner loop: adjust region size)
-          functionValue=newFunctionValue
-          xi=newXi
-          IF(converged) THEN
-            exitTag=DATA_PROJECTION_EXIT_TAG_CONVERGED
-            EXIT
+          ENDDO main_loop !iterationIdx1 (outer loop)
+          IF(exitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT.AND.iterationIdx1>=dataProjection%maximumNumberOfIterations) &
+            & exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION
+          IF((projectionExitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT).OR.(DSQRT(functionValue)<projectionDistance)) THEN
+            projectionExitTag=exitTag
+            projectionElementNumber=elementNumber
+            projectionDistance=DSQRT(functionValue)
+            projectionXi=xi
+            projectionVector=distanceVector
           ENDIF
-        ENDDO main_loop !iterationIdx1 (outer loop)
-        IF(exitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT.AND.iterationIdx1>=dataProjection%maximumNumberOfIterations) &
-          & exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION
-        IF((projectionExitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT).OR.(DSQRT(functionValue)<projectionDistance)) THEN
-          projectionExitTag=exitTag
-          projectionElementNumber=elementNumber
-          projectionDistance=DSQRT(functionValue)
-          projectionXi=xi
-          projectionVector=distanceVector
         ENDIF
-      ENDIF
-    ENDDO !elementIdx
+      ENDDO !elementIdx
+    ENDIF
     
     EXITS("DataProjection_NewtonElementsEvaluate_1")
     RETURN
@@ -2388,7 +2551,7 @@ SUBROUTINE DataProjection_NewtonElementsEvaluate_2(dataProjection,interpolatedPo
     INTEGER(INTG), INTENT(OUT) :: projectionExitTag !<On exit, the exit tag status for the data point projection
     INTEGER(INTG), INTENT(OUT) :: projectionElementNumber !<On exit, the element number of the data point projection
     REAL(DP), INTENT(OUT) :: projectionDistance !<On exit, the projection distance
-    REAL(DP), INTENT(OUT) :: projectionXi(2) !<projectionXi(xiIdx). On exit, the xi location of the data point projection
+    REAL(DP), INTENT(INOUT) :: projectionXi(2) !<projectionXi(xiIdx). On exit, the xi location of the data point projection
     REAL(DP), INTENT(OUT) :: projectionVector(3) !<projectionVector(componentIdx). On exit, the projection vector for the data point projection
     INTEGER(INTG), INTENT(OUT) :: err !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
@@ -2414,188 +2577,199 @@ SUBROUTINE DataProjection_NewtonElementsEvaluate_2(dataProjection,interpolatedPo
     IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
     IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
     
-    projectionExitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
     meshComponentNumber=interpolatedPoint%INTERPOLATION_PARAMETERS%field%decomposition%MESH_COMPONENT_NUMBER
     domainMapping=>interpolatedPoint%INTERPOLATION_PARAMETERS%field%decomposition%domain(meshComponentNumber)%ptr% &
       & mappings%elements
     numberOfCoordinates=dataProjection%numberOfCoordinates
-    relativeTolerance=dataProjection%relativeTolerance
-    absoluteTolerance=dataProjection%absoluteTolerance
-    maximumDelta=dataProjection%maximumIterationUpdate
-    minimumDelta=0.025_DP*maximumDelta !need to set a minimum, in case if it gets too small      
-    DO elementIdx=1,SIZE(candidateElements,1) !project on each candidate elements
-      elementNumber=candidateElements(elementIdx)
-      IF(elementNumber>0) THEN
-        exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
-        converged=.FALSE.
-        !start at half the maximumDelta as we do not know if quadratic model is a good approximation yet                      
-        delta=0.5_DP*maximumDelta 
-        CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,elementNumber, &
-          & interpolatedPoint%INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-        xi=dataProjection%startingXi
-        CALL Field_InterpolateXi(SECOND_PART_DERIV,xi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-        distanceVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
-          & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
-        functionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
-        !Outer loop
-        main_loop: DO iterationIdx1=1,dataProjection%maximumNumberOfIterations 
-          !Check for bounds [0,1]
-          DO xiIdx=1,2 
-            IF(ABS(xi(xiIdx))<ZERO_TOLERANCE) THEN
-              bound(xiIdx)=-1 !bound at negative direction             
-            ELSEIF(ABS(xi(xiIdx)-1.0_DP)<ZERO_TOLERANCE) THEN
-              bound(xiIdx)=1 !bound at positive direction
-            ELSE !inside the bounds
-              bound(xiIdx)=0
-            ENDIF
-          ENDDO !xiIdx              
-          !functionGradient 
-          functionGradient(1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1)))
-          functionGradient(2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
-          !functionHessian 
-          functionHessian(1,1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S1))- &
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1))) 
-          functionHessian(1,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S2))- &         
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
-          functionHessian(2,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2_S2))- &
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
-          !A model trust region approach, a Newton step is taken if the minimum lies inside the trust region (delta),
-          !if not, shift the step towards the steepest descent
-          temp1=0.5_DP*(functionHessian(1,1)+functionHessian(2,2))
-          temp2=DSQRT((0.5_DP*(functionHessian(1,1)-functionHessian(2,2)))**2+functionHessian(1,2)**2)
-          minEigen=temp1-temp2
-          maxEigen=temp1+temp2
-          functionGradientNorm=DSQRT(DOT_PRODUCT(functionGradient,functionGradient))
-          !Inner loop: adjust region size, usually EXIT at 1 or 2 iterations
-          DO iterationIdx2=1,dataProjection%maximumNumberOfIterations 
-            temp1=functionGradientNorm/delta
-            !Estimate if the solution is inside the trust region without calculating a Newton step, this also guarantees
-            !the Hessian matrix is positive definite
-            insideRegion=(minEigen>=temp1).AND.(minEigen>absoluteTolerance) 
-            IF(insideRegion) THEN
-              determinant=minEigen*maxEigen !det(H)
-              hessianDiagonal(1)=functionHessian(1,1)
-              hessianDiagonal(2)=functionHessian(2,2)
-            ELSE
-              eigenShift=MAX(temp1-minEigen,absoluteTolerance) !shift towards steepest decent
-              determinant=temp1*(maxEigen+eigenShift) !det(H)
-              hessianDiagonal(1)=functionHessian(1,1)+eigenShift
-              hessianDiagonal(2)=functionHessian(2,2)+eigenShift
-            ENDIF
-            updateXi(1)=-(hessianDiagonal(2)*functionGradient(1)-functionHessian(1,2)*functionGradient(2))/determinant
-            updateXi(2)=(functionHessian(1,2)*functionGradient(1)-hessianDiagonal(1)*functionGradient(2))/determinant
-            updateXiNorm=DSQRT(DOT_PRODUCT(updateXi,updateXi))
-            free=.TRUE.
-            DO xiIdx=1,2
-              IF((bound(xiIdx)/=0).AND.(bound(xiIdx)>0.EQV.updateXi(xiIdx)>0.0_DP)) THEN
-                !Projection will go out of element bounds
-                IF(.NOT.free) THEN !both xi are fixed
-                  exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
-                  EXIT main_loop
-                ENDIF
-                free=.FALSE.
-                fixedXiIdx=xiIdx
-              ENDIF
-            ENDDO !xiIdx
-            IF(free) THEN
-              !Both xi are free
-              IF(.NOT.insideRegion) THEN
-                IF(updateXiNorm>0.0_DP) THEN
-                  updateXi=delta/updateXiNorm*updateXi !readjust updateXi to lie on the region bound                      
-                ENDIF
-              ENDIF
-            ELSE
-              !xi are not free
-              updateXi(fixedXiIdx)=0.0_DP
-              xiIdx=3-fixedXiIdx
-              insideRegion=.FALSE.
-              IF(functionHessian(xiIdx,xiIdx)>0.0_DP) THEN
-                !Positive: minimum exists in the unbounded direction                
-                updateXi(xiIdx)=-functionGradient(xiIdx)/functionHessian(xiIdx,xiIdx)
-                updateXiNorm=DABS(updateXi(xiIdx))
-                insideRegion=updateXiNorm<=delta
-              ENDIF
-              IF(.NOT.insideRegion) THEN
-                !Minimum not in the region
-                updateXi(xiIdx)=-DSIGN(delta,functionGradient(xiIdx))
-                updateXiNorm=delta
+    IF(projectionExitTag==DATA_PROJECTION_USER_SPECIFIED) THEN
+      IF(projectionElementNumber==0) CALL FlagError("The projection element number has not been set.",err,error,*999)
+      CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,projectionElementNumber, &
+        & interpolatedPoint%INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+      CALL Field_InterpolateXi(NO_PART_DERIV,projectionXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+      projectionVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
+        & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+      projectionDistance=DSQRT(DOT_PRODUCT(projectionVector(1:numberOfCoordinates),projectionVector(1:numberOfCoordinates)))
+    ELSE
+      projectionExitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+      relativeTolerance=dataProjection%relativeTolerance
+      absoluteTolerance=dataProjection%absoluteTolerance
+      maximumDelta=dataProjection%maximumIterationUpdate
+      minimumDelta=0.025_DP*maximumDelta !need to set a minimum, in case if it gets too small      
+      DO elementIdx=1,SIZE(candidateElements,1) !project on each candidate elements
+        elementNumber=candidateElements(elementIdx)
+        IF(elementNumber>0) THEN
+          exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+          converged=.FALSE.
+          !start at half the maximumDelta as we do not know if quadratic model is a good approximation yet                      
+          delta=0.5_DP*maximumDelta 
+          CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,elementNumber, &
+            & interpolatedPoint%INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+          xi=projectionXi
+          CALL Field_InterpolateXi(SECOND_PART_DERIV,xi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+          distanceVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
+            & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+          functionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
+          !Outer loop
+          main_loop: DO iterationIdx1=1,dataProjection%maximumNumberOfIterations 
+            !Check for bounds [0,1]
+            DO xiIdx=1,2 
+              IF(ABS(xi(xiIdx))<ZERO_TOLERANCE) THEN
+                bound(xiIdx)=-1 !bound at negative direction             
+              ELSEIF(ABS(xi(xiIdx)-1.0_DP)<ZERO_TOLERANCE) THEN
+                bound(xiIdx)=1 !bound at positive direction
+              ELSE !inside the bounds
+                bound(xiIdx)=0
               ENDIF
-            ENDIF
-            !First half of the convergence test
-            converged=updateXiNorm<absoluteTolerance 
-            newXi=xi+updateXi !update xi
-            DO xiIdx=1,2
-              IF(newXi(xiIdx)<0.0_DP) THEN !boundary collision check
-                newXi(xiIdx)=0.0_DP
-                newXi(3-xiIdx)=xi(3-xiIdx)-updateXi(3-xiIdx)*xi(xiIdx)/updateXi(xiIdx)
-              ELSEIF(newXi(xiIdx)>1.0_DP) THEN
-                newXi(xiIdx)=1.0_DP  
-                newXi(3-xiIdx)=xi(3-xiIdx)+updateXi(3-xiIdx)*(1.0_DP-xi(xiIdx))/updateXi(xiIdx)
+            ENDDO !xiIdx              
+            !functionGradient 
+            functionGradient(1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1)))
+            functionGradient(2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
+            !functionHessian 
+            functionHessian(1,1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S1))- &
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1))) 
+            functionHessian(1,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S2))- &         
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
+            functionHessian(2,1)=functionHessian(1,2)
+            functionHessian(2,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2_S2))- &
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
+            !A model trust region approach, a Newton step is taken if the minimum lies inside the trust region (delta),
+            !if not, shift the step towards the steepest descent
+            temp1=0.5_DP*(functionHessian(1,1)+functionHessian(2,2))
+            temp2=DSQRT((0.5_DP*(functionHessian(1,1)-functionHessian(2,2)))**2+functionHessian(1,2)**2)
+            minEigen=temp1-temp2
+            maxEigen=temp1+temp2
+            functionGradientNorm=DSQRT(DOT_PRODUCT(functionGradient,functionGradient))
+            !Inner loop: adjust region size, usually EXIT at 1 or 2 iterations
+            DO iterationIdx2=1,dataProjection%maximumNumberOfIterations 
+              temp1=functionGradientNorm/delta
+              !Estimate if the solution is inside the trust region without calculating a Newton step, this also guarantees
+              !the Hessian matrix is positive definite
+              insideRegion=(minEigen>=temp1).AND.(minEigen>absoluteTolerance) 
+              IF(insideRegion) THEN
+                determinant=minEigen*maxEigen !det(H)
+                hessianDiagonal(1)=functionHessian(1,1)
+                hessianDiagonal(2)=functionHessian(2,2)
+              ELSE
+                eigenShift=MAX(temp1-minEigen,absoluteTolerance) !shift towards steepest decent
+                determinant=temp1*(maxEigen+eigenShift) !det(H)
+                hessianDiagonal(1)=functionHessian(1,1)+eigenShift
+                hessianDiagonal(2)=functionHessian(2,2)+eigenShift
               ENDIF
-            ENDDO
-            CALL Field_InterpolateXi(SECOND_PART_DERIV,newXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-            distanceVector(1:numberOfCoordinates)=dataPointLocation-interpolatedPoint%values(:,NO_PART_DERIV)
-            newFunctionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
-            !Second half of the convergence test (before collision detection)
-            converged=converged.AND.(DABS(newFunctionValue-functionValue)/(1.0_DP+functionValue)<relativeTolerance) 
-            IF(converged) EXIT !converged: exit inner loop first
-            IF((newFunctionValue-functionValue)>absoluteTolerance) THEN
-              !Bad model: reduce step size
-              IF(delta<=minimumDelta) THEN
-                !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
-                exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
-                EXIT main_loop
+              updateXi(1)=-(hessianDiagonal(2)*functionGradient(1)-functionHessian(1,2)*functionGradient(2))/determinant
+              updateXi(2)=(functionHessian(1,2)*functionGradient(1)-hessianDiagonal(1)*functionGradient(2))/determinant
+              updateXiNorm=DSQRT(DOT_PRODUCT(updateXi,updateXi))
+              free=.TRUE.
+              DO xiIdx=1,2
+                IF((bound(xiIdx)/=0).AND.(bound(xiIdx)>0.EQV.updateXi(xiIdx)>0.0_DP)) THEN
+                  !Projection will go out of element bounds
+                  IF(.NOT.free) THEN !both xi are fixed
+                    exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
+                    EXIT main_loop
+                  ENDIF
+                  free=.FALSE.
+                  fixedXiIdx=xiIdx
+                ENDIF
+              ENDDO !xiIdx
+              IF(free) THEN
+                !Both xi are free
+                IF(.NOT.insideRegion) THEN
+                  IF(updateXiNorm>0.0_DP) THEN
+                    updateXi=delta/updateXiNorm*updateXi !readjust updateXi to lie on the region bound                      
+                  ENDIF
+                ENDIF
+              ELSE
+                !xi are not free
+                updateXi(fixedXiIdx)=0.0_DP
+                xiIdx=3-fixedXiIdx
+                insideRegion=.FALSE.
+                IF(functionHessian(xiIdx,xiIdx)>0.0_DP) THEN
+                  !Positive: minimum exists in the unbounded direction                
+                  updateXi(xiIdx)=-functionGradient(xiIdx)/functionHessian(xiIdx,xiIdx)
+                  updateXiNorm=DABS(updateXi(xiIdx))
+                  insideRegion=updateXiNorm<=delta
+                ENDIF
+                IF(.NOT.insideRegion) THEN
+                  !Minimum not in the region
+                  updateXi(xiIdx)=-DSIGN(delta,functionGradient(xiIdx))
+                  updateXiNorm=delta
+                ENDIF
               ENDIF
-              delta=DMAX1(minimumDelta,0.25_DP*delta)
-            ELSE
-              predictedReduction=DOT_PRODUCT(functionGradient,updateXi)+ &
-                & 0.5_DP*(updateXi(1)*(updateXi(1)*functionHessian(1,1)+2.0_DP*updateXi(2)*functionHessian(1,2))+ &
-                & updateXi(2)**2*functionHessian(2,2))
-              predictionAccuracy=(newFunctionValue-functionValue)/predictedReduction
-              IF(predictionAccuracy<0.01_DP) THEN
-                !Bad model: reduce region size
+              !First half of the convergence test
+              converged=updateXiNorm<absoluteTolerance 
+              newXi=xi+updateXi !update xi
+              DO xiIdx=1,2
+                IF(newXi(xiIdx)<0.0_DP) THEN !boundary collision check
+                  newXi(xiIdx)=0.0_DP
+                  newXi(3-xiIdx)=xi(3-xiIdx)-updateXi(3-xiIdx)*xi(xiIdx)/updateXi(xiIdx)
+                ELSEIF(newXi(xiIdx)>1.0_DP) THEN
+                  newXi(xiIdx)=1.0_DP  
+                  newXi(3-xiIdx)=xi(3-xiIdx)+updateXi(3-xiIdx)*(1.0_DP-xi(xiIdx))/updateXi(xiIdx)
+                ENDIF
+              ENDDO
+              CALL Field_InterpolateXi(SECOND_PART_DERIV,newXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+              distanceVector(1:numberOfCoordinates)=dataPointLocation-interpolatedPoint%values(:,NO_PART_DERIV)
+              newFunctionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
+              !Second half of the convergence test (before collision detection)
+              converged=converged.AND.(DABS(newFunctionValue-functionValue)/(1.0_DP+functionValue)<relativeTolerance) 
+              IF(converged) EXIT !converged: exit inner loop first
+              IF((newFunctionValue-functionValue)>absoluteTolerance) THEN
+                !Bad model: reduce step size
                 IF(delta<=minimumDelta) THEN
                   !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
                   exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
                   EXIT main_loop
                 ENDIF
-                delta=DMAX1(minimumDelta,0.5_DP*delta)
-              ELSEIF(predictionAccuracy>0.9_DP.AND.predictionAccuracy<1.1_DP) THEN
-                !Good model: increase region size
-                delta=DMIN1(maximumDelta,2.0_DP*delta)
-                EXIT
+                delta=DMAX1(minimumDelta,0.25_DP*delta)
               ELSE
-                !OK model: keep the current region size
-                EXIT
+                predictedReduction=DOT_PRODUCT(functionGradient,updateXi)+ &
+                  & 0.5_DP*(updateXi(1)*(updateXi(1)*functionHessian(1,1)+2.0_DP*updateXi(2)*functionHessian(1,2))+ &
+                  & updateXi(2)**2*functionHessian(2,2))
+                predictionAccuracy=(newFunctionValue-functionValue)/predictedReduction
+                IF(predictionAccuracy<0.01_DP) THEN
+                  !Bad model: reduce region size
+                  IF(delta<=minimumDelta) THEN
+                    !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
+                    exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
+                    EXIT main_loop
+                  ENDIF
+                  delta=DMAX1(minimumDelta,0.5_DP*delta)
+                ELSEIF(predictionAccuracy>0.9_DP.AND.predictionAccuracy<1.1_DP) THEN
+                  !Good model: increase region size
+                  delta=DMIN1(maximumDelta,2.0_DP*delta)
+                  EXIT
+                ELSE
+                  !OK model: keep the current region size
+                  EXIT
+                ENDIF
               ENDIF
+            ENDDO !iterationIdx2 (inner loop: adjust region size)
+            functionValue=newFunctionValue
+            xi=newXi
+            IF(converged) THEN
+              exitTag=DATA_PROJECTION_EXIT_TAG_CONVERGED
+              EXIT
             ENDIF
-          ENDDO !iterationIdx2 (inner loop: adjust region size)
-          functionValue=newFunctionValue
-          xi=newXi
-          IF(converged) THEN
-            exitTag=DATA_PROJECTION_EXIT_TAG_CONVERGED
-            EXIT
+          ENDDO main_loop !iterationIdx1 (outer loop)
+          IF(exitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT.AND.iterationIdx1>=dataProjection%maximumNumberOfIterations) &
+            & exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION
+          IF((projectionExitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT).OR.(DSQRT(functionValue)<projectionDistance)) THEN
+            projectionExitTag=exitTag
+            projectionElementNumber=elementNumber
+            projectionDistance=DSQRT(functionValue)
+            projectionXi=xi
+            projectionVector=distanceVector
           ENDIF
-        ENDDO main_loop !iterationIdx1 (outer loop)
-        IF(exitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT.AND.iterationIdx1>=dataProjection%maximumNumberOfIterations) &
-          & exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION
-        IF((projectionExitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT).OR.(DSQRT(functionValue)<projectionDistance)) THEN
-          projectionExitTag=exitTag
-          projectionElementNumber=elementNumber
-          projectionDistance=DSQRT(functionValue)
-          projectionXi=xi
-          projectionVector=distanceVector
         ENDIF
-      ENDIF
-    ENDDO !elementIdx
+      ENDDO !elementIdx
+    ENDIF
     
     EXITS("DataProjection_NewtonElementsEvaluate_2")
     RETURN
@@ -2619,7 +2793,7 @@ SUBROUTINE DataProjection_NewtonElementsEvaluate_3(dataProjection,interpolatedPo
     INTEGER(INTG), INTENT(OUT) :: projectionExitTag !<On exit, the exit tag status for the data point projection
     INTEGER(INTG), INTENT(OUT) :: projectionElementNumber !<On exit, the element number of the data point projection
     REAL(DP), INTENT(OUT) :: projectionDistance !<On exit, the projection distance
-    REAL(DP), INTENT(OUT) :: projectionXi(3) !<projectionXi(xiIdx). On exit, the xi location of the data point projection
+    REAL(DP), INTENT(INOUT) :: projectionXi(3) !<projectionXi(xiIdx). On exit, the xi location of the data point projection
     REAL(DP), INTENT(OUT) :: projectionVector(3) !<projectionVector(componentIdx). On exit, the projection vector for the data point projection
     INTEGER(INTG), INTENT(OUT) :: err !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
@@ -2646,317 +2820,330 @@ SUBROUTINE DataProjection_NewtonElementsEvaluate_3(dataProjection,interpolatedPo
     IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
     IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
     
-    projectionExitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
     meshComponentNumber=interpolatedPoint%INTERPOLATION_PARAMETERS%field%decomposition%MESH_COMPONENT_NUMBER
     domainMapping=>interpolatedPoint%INTERPOLATION_PARAMETERS%field%decomposition%domain(meshComponentNumber)%ptr% &
       & mappings%elements
     numberOfCoordinates=dataProjection%numberOfCoordinates
-    relativeTolerance=dataProjection%relativeTolerance
-    absoluteTolerance=dataProjection%absoluteTolerance
-    maximumDelta=dataProjection%maximumIterationUpdate
-    minimumDelta=0.025_DP*maximumDelta !need to set a minimum, in case if it gets too small
-    !Project on each candidate elements
-    DO elementIdx=1,SIZE(candidateElements,1)
-      elementNumber=candidateElements(elementIdx)
-      IF(elementNumber>0) THEN
-        exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
-        converged=.FALSE.
-        !start at half the maximumDelta as we do not know if quadratic model is a good approximation yet            
-        delta=0.5_DP*maximumDelta 
-        CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,elementNumber, &
-          & interpolatedPoint%INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-        xi=dataProjection%startingXi
-        CALL Field_InterpolateXi(SECOND_PART_DERIV,xi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-        distanceVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
-          interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
-        functionValue=DOT_PRODUCT(distanceVector,distanceVector)
-        !Outer loop
-        main_loop: DO iterationIdx1=1,dataProjection%maximumNumberOfIterations 
-          !Check for bounds [0,1]
-          DO xiIdx=1,3
-            IF(ABS(xi(xiIdx))<ZERO_TOLERANCE) THEN
-              bound(xiIdx)=-1 !bound at negative direction             
-            ELSEIF(ABS(xi(xiIdx)-1.0_DP)<ZERO_TOLERANCE) THEN
-              bound(xiIdx)=1 !bound at positive direction
-            ELSE 
-              bound(xiIdx)=0 !inside the bounds
-            ENDIF
-          ENDDO !xiIdx              
-          !functionGradient 
-          functionGradient(1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1)))
-          functionGradient(2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
-          functionGradient(3)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3)))
-          !functionHessian 
-          functionHessian(1,1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S1))- &
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1))) 
-          functionHessian(1,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S2))- &         
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
-          functionHessian(1,3)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S3))- &         
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3)))
-          functionHessian(2,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2_S2))- &
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
-          functionHessian(2,3)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2_S3))- &
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3)))
-          functionHessian(3,3)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3_S3))- &
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3)))    
-          !A model trust region approach, a Newton step is taken if the solution lies inside the trust region (delta),
-          !if not, shift the step towards the steepest descent
-          trace=functionHessian(1,1)+functionHessian(2,2)+functionHessian(3,3) !tr(H)
-          trace2=functionHessian(1,1)*functionHessian(2,2)+functionHessian(1,1)*functionHessian(3,3)+ &
-            & functionHessian(2,2)*functionHessian(3,3)-functionHessian(1,2)**2-functionHessian(1,3)**2- &
-            & functionHessian(2,3)**2 !tr(H**2)-(tr(H))**2
-          determinant=functionHessian(1,1)*functionHessian(2,2)*functionHessian(3,3)- &
-            & functionHessian(1,1)*functionHessian(2,3)**2-functionHessian(2,2)*functionHessian(1,3)**2- &
-            & functionHessian(3,3)*functionHessian(1,2)**2+ &
-            & 2.0_DP*functionHessian(1,2)*functionHessian(1,3)*functionHessian(2,3) !det(H)                 
-          temp1=-trace/3.0_DP
-          temp2=trace2/3.0_DP
-          temp3=temp2-temp1**2 !<=0
-          IF(temp3>-1.0E-5_DP) THEN !include some negatives for numerical errors
-            minEigen=-temp1 !all eigenvalues are the same                
-          ELSE
-            temp3=DSQRT(-temp3)
-            temp4=(determinant+3.0_DP*(temp1*temp2)-2.0_DP*temp1**3)/(2.0_DP*temp3**3)
-            minEigen=2.0_DP*temp3*DCOS((DACOS(temp4)+TWOPI)/3.0_DP)-temp1                
-          ENDIF
-          functionGradientNorm=DSQRT(DOT_PRODUCT(functionGradient,functionGradient))
-          !Inner loop: adjust region size, usually EXIT at 1 or 2 iterations
-          DO iterationIdx2=1,dataProjection%maximumNumberOfIterations 
-            temp1=functionGradientNorm/delta
-            !Estimate if the solution is inside the trust region without calculating a Newton step, this also guarantees
-            !the Hessian matrix is positive definite
-            insideRegion=(minEigen>=temp1).AND.(minEigen>absoluteTolerance) 
-            IF(insideRegion) THEN
-              hessianDiagonal(1)=functionHessian(1,1)
-              hessianDiagonal(2)=functionHessian(2,2)
-              hessianDiagonal(3)=functionHessian(3,3)
-            ELSE
-              eigenShift=MAX(temp1-minEigen,absoluteTolerance) !shift towards steepest decent
-              determinant=determinant+eigenShift*(trace2+eigenShift*(trace+eigenShift)) !shift the determinant
-              hessianDiagonal(1)=functionHessian(1,1)+eigenShift
-              hessianDiagonal(2)=functionHessian(2,2)+eigenShift
-              hessianDiagonal(3)=functionHessian(3,3)+eigenShift
-            ENDIF
-            temp2=functionHessian(1,3)*functionHessian(2,3)-functionHessian(1,2)*hessianDiagonal(3)
-            temp3=functionHessian(1,2)*functionHessian(2,3)-functionHessian(1,3)*hessianDiagonal(2)
-            temp4=functionHessian(1,2)*functionHessian(1,3)-functionHessian(2,3)*hessianDiagonal(1)               
-            updateXi(1)=((functionHessian(2,3)**2-hessianDiagonal(2)*hessianDiagonal(3))*functionGradient(1)- &
-              & temp2*functionGradient(2)-temp3*functionGradient(3))/determinant
-            updateXi(2)=((functionHessian(1,3)**2-hessianDiagonal(1)*hessianDiagonal(3))*functionGradient(2)- & 
-              & temp2*functionGradient(1)-temp4*functionGradient(3))/determinant
-            updateXi(3)=((functionHessian(1,2)**2-hessianDiagonal(1)*hessianDiagonal(2))*functionGradient(3)- &
-              & temp3*functionGradient(1)-temp4*functionGradient(2))/determinant
-            updateXiNorm=DSQRT(DOT_PRODUCT(updateXi,updateXi))
-            free=.TRUE.
-            nBound=0
+    IF(projectionExitTag==DATA_PROJECTION_USER_SPECIFIED) THEN
+      IF(projectionElementNumber==0) CALL FlagError("The projection element number has not been set.",err,error,*999)
+      CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,projectionElementNumber, &
+        & interpolatedPoint%INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+      CALL Field_InterpolateXi(NO_PART_DERIV,projectionXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+      projectionVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
+        & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+      projectionDistance=DSQRT(DOT_PRODUCT(projectionVector(1:numberOfCoordinates),projectionVector(1:numberOfCoordinates)))
+    ELSE
+      projectionExitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+      relativeTolerance=dataProjection%relativeTolerance
+      absoluteTolerance=dataProjection%absoluteTolerance
+      maximumDelta=dataProjection%maximumIterationUpdate
+      minimumDelta=0.025_DP*maximumDelta !need to set a minimum, in case if it gets too small
+      !Project on each candidate elements
+      DO elementIdx=1,SIZE(candidateElements,1)
+        elementNumber=candidateElements(elementIdx)
+        IF(elementNumber>0) THEN
+          exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+          converged=.FALSE.
+          !start at half the maximumDelta as we do not know if quadratic model is a good approximation yet            
+          delta=0.5_DP*maximumDelta 
+          CALL Field_InterpolationParametersElementGet(dataProjection%projectionSetType,elementNumber, &
+            & interpolatedPoint%INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+          xi=projectionXi
+          CALL Field_InterpolateXi(SECOND_PART_DERIV,xi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+          distanceVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
+            interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+          functionValue=DOT_PRODUCT(distanceVector,distanceVector)
+          !Outer loop
+          main_loop: DO iterationIdx1=1,dataProjection%maximumNumberOfIterations 
+            !Check for bounds [0,1]
             DO xiIdx=1,3
-              IF((bound(xiIdx)/=0).AND.(bound(xiIdx)>0.EQV.updateXi(xiIdx)>0.0_DP)) THEN
-                !Projection will go out of element bounds
-                nBound=nBound+1
-                free=.FALSE.
-                IF(nBound<=2) THEN
-                  fixedXiIdx2(nBound)=xiIdx
-                ELSE
-                  !All xi are fixed
-                  exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
-                  EXIT main_loop
-                ENDIF
-              ENDIF
-            ENDDO !xiIdx
-            IF(free) THEN
-              !All xi are free
-              IF(.NOT.insideRegion) THEN
-                IF(updateXiNorm>0.0_DP) THEN
-                  updateXi=delta/updateXiNorm*updateXi !readjust updateXi to lie on the region bound                      
-                ENDIF
+              IF(ABS(xi(xiIdx))<ZERO_TOLERANCE) THEN
+                bound(xiIdx)=-1 !bound at negative direction             
+              ELSEIF(ABS(xi(xiIdx)-1.0_DP)<ZERO_TOLERANCE) THEN
+                bound(xiIdx)=1 !bound at positive direction
+              ELSE 
+                bound(xiIdx)=0 !inside the bounds
               ENDIF
+            ENDDO !xiIdx              
+            !functionGradient 
+            functionGradient(1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1)))
+            functionGradient(2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
+            functionGradient(3)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3)))
+            !functionHessian 
+            functionHessian(1,1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S1))- &
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1))) 
+            functionHessian(1,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S2))- &         
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
+            functionHessian(1,3)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S3))- &         
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3)))
+            functionHessian(2,1)=functionHessian(1,2)
+            functionHessian(2,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2_S2))- &
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
+            functionHessian(2,3)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2_S3))- &
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3)))
+            functionHessian(3,1)=functionHessian(1,3)
+            functionHessian(3,2)=functionHessian(2,3)
+            functionHessian(3,3)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3_S3))- &
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S3)))    
+            !A model trust region approach, a Newton step is taken if the solution lies inside the trust region (delta),
+            !if not, shift the step towards the steepest descent
+            trace=functionHessian(1,1)+functionHessian(2,2)+functionHessian(3,3) !tr(H)
+            trace2=functionHessian(1,1)*functionHessian(2,2)+functionHessian(1,1)*functionHessian(3,3)+ &
+              & functionHessian(2,2)*functionHessian(3,3)-functionHessian(1,2)**2-functionHessian(1,3)**2- &
+              & functionHessian(2,3)**2 !tr(H**2)-(tr(H))**2
+            determinant=functionHessian(1,1)*functionHessian(2,2)*functionHessian(3,3)- &
+              & functionHessian(1,1)*functionHessian(2,3)**2-functionHessian(2,2)*functionHessian(1,3)**2- &
+              & functionHessian(3,3)*functionHessian(1,2)**2+ &
+              & 2.0_DP*functionHessian(1,2)*functionHessian(1,3)*functionHessian(2,3) !det(H)                 
+            temp1=-trace/3.0_DP
+            temp2=trace2/3.0_DP
+            temp3=temp2-temp1**2 !<=0
+            IF(temp3>-1.0E-5_DP) THEN !include some negatives for numerical errors
+              minEigen=-temp1 !all eigenvalues are the same                
             ELSE
-              !At least one of the xi are not free
-              !Try 2D projection
-              free=.TRUE.
-              fixedXiIdx=fixedXiIdx2(1)
-              IF(nBound==2) THEN
-                !only fix the direction that is most strongly suggesting leaving the element
-                IF(updateXi(fixedXiIdx2(2))>updateXi(fixedXiIdx2(1))) fixedXiIdx=fixedXiIdx2(2) 
-              ENDIF
-              updateXi(fixedXiIdx)=0.0_DP
-              faceXiIdxs(1)=1+MOD(fixedXiIdx,3)
-              faceXiIdxs(2)=1+MOD(fixedXiIdx+1,3)
-              !functionGradient2
-              functionGradient2(1)=functionGradient(faceXiIdxs(1))
-              functionGradient2(2)=functionGradient(faceXiIdxs(2))
-              !functionHessian2
-              functionHessian2(1,1)=functionHessian(faceXiIdxs(1),faceXiIdxs(1))
-              functionHessian2(1,2)=functionHessian(faceXiIdxs(1),faceXiIdxs(2))
-              functionHessian2(2,2)=functionHessian(faceXiIdxs(2),faceXiIdxs(2))
-              !re-estimate the trust solution in 2D
-              temp1=0.5_DP*(functionHessian2(1,1)+functionHessian2(2,2))
-              temp2=DSQRT((0.5_DP*(functionHessian2(1,1)-functionHessian2(2,2)))**2+functionHessian2(1,2)**2)
-              minEigen=temp1-temp2
-              maxEigen=temp1+temp2
-              temp3=DSQRT(DOT_PRODUCT(functionGradient2,functionGradient2))/delta
+              temp3=DSQRT(-temp3)
+              temp4=(determinant+3.0_DP*(temp1*temp2)-2.0_DP*temp1**3)/(2.0_DP*temp3**3)
+              minEigen=2.0_DP*temp3*DCOS((DACOS(temp4)+TWOPI)/3.0_DP)-temp1                
+            ENDIF
+            functionGradientNorm=DSQRT(DOT_PRODUCT(functionGradient,functionGradient))
+            !Inner loop: adjust region size, usually EXIT at 1 or 2 iterations
+            DO iterationIdx2=1,dataProjection%maximumNumberOfIterations 
+              temp1=functionGradientNorm/delta
               !Estimate if the solution is inside the trust region without calculating a Newton step, this also guarantees
               !the Hessian matrix is positive definite
-              insideRegion=(minEigen>=temp3).AND.(minEigen>absoluteTolerance) 
+              insideRegion=(minEigen>=temp1).AND.(minEigen>absoluteTolerance) 
               IF(insideRegion) THEN
-                determinant=minEigen*maxEigen !determinant of functionHessian
-                hessianDiagonal2(1)=functionHessian2(1,1)
-                hessianDiagonal2(2)=functionHessian2(2,2)
+                hessianDiagonal(1)=functionHessian(1,1)
+                hessianDiagonal(2)=functionHessian(2,2)
+                hessianDiagonal(3)=functionHessian(3,3)
               ELSE
-                eigenShift=MAX(temp3-minEigen,absoluteTolerance) !shift towards steepest decent
-                determinant=temp3*(maxEigen+eigenShift) !determinant of shifted functionHessian
-                hessianDiagonal2(1)=functionHessian2(1,1)+eigenShift
-                hessianDiagonal2(2)=functionHessian2(2,2)+eigenShift
+                eigenShift=MAX(temp1-minEigen,absoluteTolerance) !shift towards steepest decent
+                determinant=determinant+eigenShift*(trace2+eigenShift*(trace+eigenShift)) !shift the determinant
+                hessianDiagonal(1)=functionHessian(1,1)+eigenShift
+                hessianDiagonal(2)=functionHessian(2,2)+eigenShift
+                hessianDiagonal(3)=functionHessian(3,3)+eigenShift
               ENDIF
-              updateXi(faceXiIdxs(1))=-(hessianDiagonal2(2)*functionGradient2(1)- &
-                & functionHessian2(1,2)*functionGradient2(2))/determinant
-              updateXi(faceXiIdxs(2))=(functionHessian2(1,2)*functionGradient2(1)- &
-                & hessianDiagonal2(1)*functionGradient2(2))/determinant
+              temp2=functionHessian(1,3)*functionHessian(2,3)-functionHessian(1,2)*hessianDiagonal(3)
+              temp3=functionHessian(1,2)*functionHessian(2,3)-functionHessian(1,3)*hessianDiagonal(2)
+              temp4=functionHessian(1,2)*functionHessian(1,3)-functionHessian(2,3)*hessianDiagonal(1)               
+              updateXi(1)=((functionHessian(2,3)**2-hessianDiagonal(2)*hessianDiagonal(3))*functionGradient(1)- &
+                & temp2*functionGradient(2)-temp3*functionGradient(3))/determinant
+              updateXi(2)=((functionHessian(1,3)**2-hessianDiagonal(1)*hessianDiagonal(3))*functionGradient(2)- & 
+                & temp2*functionGradient(1)-temp4*functionGradient(3))/determinant
+              updateXi(3)=((functionHessian(1,2)**2-hessianDiagonal(1)*hessianDiagonal(2))*functionGradient(3)- &
+                & temp3*functionGradient(1)-temp4*functionGradient(2))/determinant
               updateXiNorm=DSQRT(DOT_PRODUCT(updateXi,updateXi))
-              !Check again for bounds
-              DO boundXiIdx=1,2
-                IF((bound(faceXiIdxs(boundXiIdx))/=0).AND.(bound(faceXiIdxs(boundXiIdx))>0.EQV. &
-                  & updateXi(faceXiIdxs(boundXiIdx))>0.0_DP)) THEN
+              free=.TRUE.
+              nBound=0
+              DO xiIdx=1,3
+                IF((bound(xiIdx)/=0).AND.(bound(xiIdx)>0.EQV.updateXi(xiIdx)>0.0_DP)) THEN
                   !Projection will go out of element bounds
-                  IF(.NOT.free) THEN
-                    !Both xi are fixed
+                  nBound=nBound+1
+                  free=.FALSE.
+                  IF(nBound<=2) THEN
+                    fixedXiIdx2(nBound)=xiIdx
+                  ELSE
+                    !All xi are fixed
                     exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
                     EXIT main_loop
                   ENDIF
-                  free=.FALSE.
-                  fixedBoundXiIdx=boundXiIdx
                 ENDIF
               ENDDO !xiIdx
               IF(free) THEN
-                !Both xi are free
+                !All xi are free
                 IF(.NOT.insideRegion) THEN
                   IF(updateXiNorm>0.0_DP) THEN
                     updateXi=delta/updateXiNorm*updateXi !readjust updateXi to lie on the region bound                      
                   ENDIF
                 ENDIF
               ELSE
-                !xi are not free
-                updateXi(faceXiIdxs(fixedBoundXiIdx))=0.0_DP
-                xiIdx=faceXiIdxs(3-fixedBoundXiIdx)
-                insideRegion=.FALSE.
-                IF(functionHessian(xiIdx,xiIdx)>0.0_DP) THEN
-                  !positive: minimum exists in the unbounded direction                
-                  updateXi(xiIdx)=-functionGradient(xiIdx)/functionHessian(xiIdx,xiIdx)
-                  updateXiNorm=DABS(updateXi(xiIdx))
-                  insideRegion=updateXiNorm<=delta
+                !At least one of the xi are not free
+                !Try 2D projection
+                free=.TRUE.
+                fixedXiIdx=fixedXiIdx2(1)
+                IF(nBound==2) THEN
+                  !only fix the direction that is most strongly suggesting leaving the element
+                  IF(updateXi(fixedXiIdx2(2))>updateXi(fixedXiIdx2(1))) fixedXiIdx=fixedXiIdx2(2) 
                 ENDIF
-                IF(.NOT.insideRegion) THEN
-                  !minimum not in the region
-                  updateXi(xiIdx)=-DSIGN(delta,functionGradient(xiIdx))
-                  updateXiNorm=delta
+                updateXi(fixedXiIdx)=0.0_DP
+                faceXiIdxs(1)=1+MOD(fixedXiIdx,3)
+                faceXiIdxs(2)=1+MOD(fixedXiIdx+1,3)
+                !functionGradient2
+                functionGradient2(1)=functionGradient(faceXiIdxs(1))
+                functionGradient2(2)=functionGradient(faceXiIdxs(2))
+                !functionHessian2
+                functionHessian2(1,1)=functionHessian(faceXiIdxs(1),faceXiIdxs(1))
+                functionHessian2(1,2)=functionHessian(faceXiIdxs(1),faceXiIdxs(2))
+                functionHessian2(2,2)=functionHessian(faceXiIdxs(2),faceXiIdxs(2))
+                !re-estimate the trust solution in 2D
+                temp1=0.5_DP*(functionHessian2(1,1)+functionHessian2(2,2))
+                temp2=DSQRT((0.5_DP*(functionHessian2(1,1)-functionHessian2(2,2)))**2+functionHessian2(1,2)**2)
+                minEigen=temp1-temp2
+                maxEigen=temp1+temp2
+                temp3=DSQRT(DOT_PRODUCT(functionGradient2,functionGradient2))/delta
+                !Estimate if the solution is inside the trust region without calculating a Newton step, this also guarantees
+                !the Hessian matrix is positive definite
+                insideRegion=(minEigen>=temp3).AND.(minEigen>absoluteTolerance) 
+                IF(insideRegion) THEN
+                  determinant=minEigen*maxEigen !determinant of functionHessian
+                  hessianDiagonal2(1)=functionHessian2(1,1)
+                  hessianDiagonal2(2)=functionHessian2(2,2)
+                ELSE
+                  eigenShift=MAX(temp3-minEigen,absoluteTolerance) !shift towards steepest decent
+                  determinant=temp3*(maxEigen+eigenShift) !determinant of shifted functionHessian
+                  hessianDiagonal2(1)=functionHessian2(1,1)+eigenShift
+                  hessianDiagonal2(2)=functionHessian2(2,2)+eigenShift
                 ENDIF
-              ENDIF !if xi are free (2D)
-            ENDIF !if xi are free (3D)
-            !First half of the convergence test
-            converged=updateXiNorm<absoluteTolerance 
-            newXi=xi+updateXi !update xi
-            DO xiIdx=1,3
-              IF(ABS(updateXi(xiIdx))<ZERO_TOLERANCE) THEN
-                !FPE Handling
-                IF(newXi(xiIdx)<0.0_DP) THEN
-                  newXi(xiIdx)=0.0_DP
-                  DO xiIdx2 = 1,3
-                    IF(xiIdx2 /= xiIdx) THEN
-                      newXi(xiIdx2)=xi(xiIdx2)-updateXi(xiIdx2)
+                updateXi(faceXiIdxs(1))=-(hessianDiagonal2(2)*functionGradient2(1)- &
+                  & functionHessian2(1,2)*functionGradient2(2))/determinant
+                updateXi(faceXiIdxs(2))=(functionHessian2(1,2)*functionGradient2(1)- &
+                  & hessianDiagonal2(1)*functionGradient2(2))/determinant
+                updateXiNorm=DSQRT(DOT_PRODUCT(updateXi,updateXi))
+                !Check again for bounds
+                DO boundXiIdx=1,2
+                  IF((bound(faceXiIdxs(boundXiIdx))/=0).AND.(bound(faceXiIdxs(boundXiIdx))>0.EQV. &
+                    & updateXi(faceXiIdxs(boundXiIdx))>0.0_DP)) THEN
+                    !Projection will go out of element bounds
+                    IF(.NOT.free) THEN
+                      !Both xi are fixed
+                      exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
+                      EXIT main_loop
                     ENDIF
-                  ENDDO
-                ELSEIF(newXi(xiIdx)>1.0_DP) THEN
-                  newXi(xiIdx)=1.0_DP
-                  DO xiIdx2 = 1,3
-                    IF(xiIdx2 /= xiIdx) THEN
-                      newXi(xiIdx2)=xi(xiIdx2)+updateXi(xiIdx2)
+                    free=.FALSE.
+                    fixedBoundXiIdx=boundXiIdx
+                  ENDIF
+                ENDDO !xiIdx
+                IF(free) THEN
+                  !Both xi are free
+                  IF(.NOT.insideRegion) THEN
+                    IF(updateXiNorm>0.0_DP) THEN
+                      updateXi=delta/updateXiNorm*updateXi !readjust updateXi to lie on the region bound                      
                     ENDIF
-                  ENDDO
+                  ENDIF
+                ELSE
+                  !xi are not free
+                  updateXi(faceXiIdxs(fixedBoundXiIdx))=0.0_DP
+                  xiIdx=faceXiIdxs(3-fixedBoundXiIdx)
+                  insideRegion=.FALSE.
+                  IF(functionHessian(xiIdx,xiIdx)>0.0_DP) THEN
+                    !positive: minimum exists in the unbounded direction                
+                    updateXi(xiIdx)=-functionGradient(xiIdx)/functionHessian(xiIdx,xiIdx)
+                    updateXiNorm=DABS(updateXi(xiIdx))
+                    insideRegion=updateXiNorm<=delta
+                  ENDIF
+                  IF(.NOT.insideRegion) THEN
+                    !minimum not in the region
+                    updateXi(xiIdx)=-DSIGN(delta,functionGradient(xiIdx))
+                    updateXiNorm=delta
+                  ENDIF
+                ENDIF !if xi are free (2D)
+              ENDIF !if xi are free (3D)
+              !First half of the convergence test
+              converged=updateXiNorm<absoluteTolerance 
+              newXi=xi+updateXi !update xi
+              DO xiIdx=1,3
+                IF(ABS(updateXi(xiIdx))<ZERO_TOLERANCE) THEN
+                  !FPE Handling
+                  IF(newXi(xiIdx)<0.0_DP) THEN
+                    newXi(xiIdx)=0.0_DP
+                    DO xiIdx2 = 1,3
+                      IF(xiIdx2 /= xiIdx) THEN
+                        newXi(xiIdx2)=xi(xiIdx2)-updateXi(xiIdx2)
+                      ENDIF
+                    ENDDO
+                  ELSEIF(newXi(xiIdx)>1.0_DP) THEN
+                    newXi(xiIdx)=1.0_DP
+                    DO xiIdx2 = 1,3
+                      IF(xiIdx2 /= xiIdx) THEN
+                        newXi(xiIdx2)=xi(xiIdx2)+updateXi(xiIdx2)
+                      ENDIF
+                    ENDDO
+                  ENDIF
+                ELSE IF(newXi(xiIdx)<0.0_DP) THEN
+                  !boundary collision check
+                  newXi(xiIdx)=0.0_DP
+                  newXi=xi-updateXi*xi(xiIdx)/updateXi(xiIdx)
+                ELSE IF(newXi(xiIdx)>1.0_DP) THEN
+                  newXi(xiIdx)=1.0_DP  
+                  newXi=xi+updateXi*(1.0_DP-xi(xiIdx))/updateXi(xiIdx)
                 ENDIF
-              ELSE IF(newXi(xiIdx)<0.0_DP) THEN
-                !boundary collision check
-                newXi(xiIdx)=0.0_DP
-                newXi=xi-updateXi*xi(xiIdx)/updateXi(xiIdx)
-              ELSE IF(newXi(xiIdx)>1.0_DP) THEN
-                newXi(xiIdx)=1.0_DP  
-                newXi=xi+updateXi*(1.0_DP-xi(xiIdx))/updateXi(xiIdx)
-              ENDIF
-            ENDDO !xiIdx
-            CALL Field_InterpolateXi(SECOND_PART_DERIV,newXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-            distanceVector=dataPointLocation-interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
-            newFunctionValue=DOT_PRODUCT(distanceVector,distanceVector)
-            !Second half of the convergence test (before collision detection)
-            converged=converged.AND.(DABS(newFunctionValue-functionValue)/(1.0_DP+functionValue)<relativeTolerance) 
-            IF(converged) EXIT !converged: exit inner loop first
-            IF((newFunctionValue-functionValue)>absoluteTolerance) THEN
-              !bad model: reduce step size
-              IF(delta<=minimumDelta) THEN
-                !something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
-                exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION ! \it will get stucked!!
-                EXIT main_loop
-              ENDIF
-              delta=DMAX1(minimumDelta,0.25_DP*delta)
-            ELSE
-              predictedReduction=DOT_PRODUCT(functionGradient,updateXi)+ &
-                & 0.5_DP*(updateXi(1)*(updateXi(1)*functionHessian(1,1)+2.0_DP*updateXi(2)*functionHessian(1,2)+ &
-                & 2.0_DP*updateXi(3)*functionHessian(1,3))+updateXi(2)*(updateXi(2)*functionHessian(2,2)+ &
-                & 2.0_DP*updateXi(3)*functionHessian(2,3))+updateXi(2)**2*functionHessian(2,2))
-              IF (ABS(predictedReduction) < ZERO_TOLERANCE) THEN
-                converged = .TRUE.  !prediction reduction converged
-                EXIT
-              ENDIF
-              predictionAccuracy=(newFunctionValue-functionValue)/predictedReduction
-              IF(predictionAccuracy<0.01_DP) THEN 
-                !bad model: reduce region size
+              ENDDO !xiIdx
+              CALL Field_InterpolateXi(SECOND_PART_DERIV,newXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+              distanceVector=dataPointLocation-interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+              newFunctionValue=DOT_PRODUCT(distanceVector,distanceVector)
+              !Second half of the convergence test (before collision detection)
+              converged=converged.AND.(DABS(newFunctionValue-functionValue)/(1.0_DP+functionValue)<relativeTolerance) 
+              IF(converged) EXIT !converged: exit inner loop first
+              IF((newFunctionValue-functionValue)>absoluteTolerance) THEN
+                !bad model: reduce step size
                 IF(delta<=minimumDelta) THEN
                   !something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
-                  exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
+                  exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION ! \it will get stucked!!
                   EXIT main_loop
                 ENDIF
-                delta=DMAX1(minimumDelta,0.5_DP*delta)
-              ELSEIF(predictionAccuracy>0.9_DP.AND.predictionAccuracy<1.1_DP) THEN
-                !good model: increase region size
-                delta=DMIN1(maximumDelta,2.0_DP*delta)
-                EXIT
+                delta=DMAX1(minimumDelta,0.25_DP*delta)
               ELSE
-                !ok model: keep the current region size
-                EXIT
+                predictedReduction=DOT_PRODUCT(functionGradient,updateXi)+ &
+                  & 0.5_DP*(updateXi(1)*(updateXi(1)*functionHessian(1,1)+2.0_DP*updateXi(2)*functionHessian(1,2)+ &
+                  & 2.0_DP*updateXi(3)*functionHessian(1,3))+updateXi(2)*(updateXi(2)*functionHessian(2,2)+ &
+                  & 2.0_DP*updateXi(3)*functionHessian(2,3))+updateXi(2)**2*functionHessian(2,2))
+                IF (ABS(predictedReduction) < ZERO_TOLERANCE) THEN
+                  converged = .TRUE.  !prediction reduction converged
+                  EXIT
+                ENDIF
+                predictionAccuracy=(newFunctionValue-functionValue)/predictedReduction
+                IF(predictionAccuracy<0.01_DP) THEN 
+                  !bad model: reduce region size
+                  IF(delta<=minimumDelta) THEN
+                    !something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
+                    exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
+                    EXIT main_loop
+                  ENDIF
+                  delta=DMAX1(minimumDelta,0.5_DP*delta)
+                ELSEIF(predictionAccuracy>0.9_DP.AND.predictionAccuracy<1.1_DP) THEN
+                  !good model: increase region size
+                  delta=DMIN1(maximumDelta,2.0_DP*delta)
+                  EXIT
+                ELSE
+                  !ok model: keep the current region size
+                  EXIT
+                ENDIF
               ENDIF
+            ENDDO !iterationIdx2 (inner loop: adjust region size)
+            functionValue=newFunctionValue
+            xi=newXi
+            IF(converged) THEN
+              exitTag=DATA_PROJECTION_EXIT_TAG_CONVERGED
+              EXIT
             ENDIF
-          ENDDO !iterationIdx2 (inner loop: adjust region size)
-          functionValue=newFunctionValue
-          xi=newXi
-          IF(converged) THEN
-            exitTag=DATA_PROJECTION_EXIT_TAG_CONVERGED
-            EXIT
+          ENDDO main_loop !iterationIdx1 (outer loop)
+          IF(exitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT.AND.iterationIdx1>=dataProjection%maximumNumberOfIterations) &
+            & exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION
+          IF((projectionExitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT).OR.(DSQRT(functionValue)<projectionDistance)) THEN
+            projectionExitTag=exitTag
+            projectionElementNumber=elementNumber
+            projectionDistance=DSQRT(functionValue)
+            projectionXi=xi
+            projectionVector=distanceVector
           ENDIF
-        ENDDO main_loop !iterationIdx1 (outer loop)
-        IF(exitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT.AND.iterationIdx1>=dataProjection%maximumNumberOfIterations) &
-          & exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION
-        IF((projectionExitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT).OR.(DSQRT(functionValue)<projectionDistance)) THEN
-          projectionExitTag=exitTag
-          projectionElementNumber=elementNumber
-          projectionDistance=DSQRT(functionValue)
-          projectionXi=xi
-          projectionVector=distanceVector
         ENDIF
-      ENDIF
-    ENDDO !elementIdx
+      ENDDO !elementIdx
+    ENDIF
     
     EXITS("DataProjection_NewtonElementsEvaluate_3")
     RETURN
@@ -2979,11 +3166,11 @@ SUBROUTINE DataProjection_NewtonFacesEvaluate(dataProjection,interpolatedPoint,d
     REAL(DP), INTENT(IN) :: dataPointLocation(:) !<dataPointLocation(componentIdx). The location of data point in the region.
     INTEGER(INTG), INTENT(IN) :: candidateElements(:)!<candidateElememnts(candidateIdx). The list of candidate elements for the projection.
     INTEGER(INTG), INTENT(IN) :: candidateElementFaces(:) !<candidateElementFaces(candidateIdx). The list of candidate faces for the projection.
-    INTEGER(INTG), INTENT(OUT) :: projectionExitTag !<On exit, the exit tag status for the data point projection
+    INTEGER(INTG), INTENT(INOUT) :: projectionExitTag !<On exit, the exit tag status for the data point projection
     INTEGER(INTG), INTENT(OUT) :: projectionElementNumber !<On exit, the element number of the data point projection
     INTEGER(INTG), INTENT(OUT) :: projectionElementFaceNumber !<On exit, the face number of the data point projection
     REAL(DP), INTENT(OUT) :: projectionDistance !<On exit, the projection distance
-    REAL(DP), INTENT(OUT) :: projectionXi(2) !<projectionXi(xiIdx). On exit, the xi location of the data point projection
+    REAL(DP), INTENT(INOUT) :: projectionXi(2) !<projectionXi(xiIdx). On exit, the xi location of the data point projection
     REAL(DP), INTENT(OUT) :: projectionVector(3) !<projectionVector(componentIdx). On exit, the projection vector for the data point projection
     INTEGER(INTG), INTENT(OUT) :: err !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string   
@@ -3007,202 +3194,215 @@ SUBROUTINE DataProjection_NewtonFacesEvaluate(dataProjection,interpolatedPoint,d
               
     IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
     IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
-    
-    projectionExitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+
     meshComponentNumber=interpolatedPoint%INTERPOLATION_PARAMETERS%FIELD%decomposition%MESH_COMPONENT_NUMBER
     domainMapping=>interpolatedPoint%INTERPOLATION_PARAMETERS%FIELD%decomposition%domain(meshComponentNumber)% &
       & PTR%MAPPINGS%ELEMENTS
     numberOfCoordinates=dataProjection%numberOfCoordinates
-    relativeTolerance=dataProjection%relativeTolerance
-    absoluteTolerance=dataProjection%absoluteTolerance
-    maximumDelta=dataProjection%maximumIterationUpdate
-    minimumDelta=0.025_DP*maximumDelta !need to set a minimum, in case if it gets too small
-    !Project on each candidate elements
-    DO elementIdx=1,SIZE(candidateElements,1) 
-      elementNumber=candidateElements(elementIdx)
-      IF(elementNumber>0) THEN
-        elementFaceNumber=candidateElementFaces(elementIdx)
-        faceNumber=interpolatedPoint%INTERPOLATION_PARAMETERS%field%decomposition%topology%elements% &
-          & elements(elementNumber)%ELEMENT_FACES(elementFaceNumber)     
-        exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
-        converged=.FALSE.
-        !start at half the maximumDelta as we do not know if quadratic model is a good approximation yet
-        delta=0.5_DP*maximumDelta 
-        CALL Field_InterpolationParametersFaceGet(dataProjection%projectionSetType,faceNumber,interpolatedPoint% &
-          & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-        xi=dataProjection%startingXi
-        CALL Field_InterpolateXi(SECOND_PART_DERIV,xi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-        distanceVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
-          & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
-        functionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
-        !Outer loop
-        main_loop: DO iterationIdx1=1,dataProjection%maximumNumberOfIterations
-          !Check for bounds [0,1]
-          DO xiIdx=1,2 
-            IF(ABS(xi(xiIdx))<ZERO_TOLERANCE) THEN
-              bound(xiIdx)=-1 !bound at negative direction             
-            ELSEIF(ABS(xi(xiIdx)-1.0_DP)<ZERO_TOLERANCE) THEN
-              bound(xiIdx)=1 !bound at positive direction
-            ELSE 
-              bound(xiIdx)=0 !inside the bounds
-            ENDIF
-          ENDDO !xiIdx              
-          !functionGradient 
-          functionGradient(1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1)))
-          functionGradient(2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
-          !functionHessian 
-          functionHessian(1,1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S1))- &
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1))) 
-          functionHessian(1,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S2))- &         
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
-          functionHessian(2,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2_S2))- &
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2), &
-            & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
-          !A model trust region approach, a Newton step is taken if the minimum lies inside the trust region (delta),
-          !if not, shift the step towards the steepest descent
-          temp1=0.5_DP*(functionHessian(1,1)+functionHessian(2,2))
-          temp2=DSQRT((0.5_DP*(functionHessian(1,1)-functionHessian(2,2)))**2+functionHessian(1,2)**2)
-          minEigen=temp1-temp2
-          maxEigen=temp1+temp2
-          functionGradientNorm=DSQRT(DOT_PRODUCT(functionGradient,functionGradient))
-          !Inner loop: adjust region size, usually EXIT at 1 or 2 iterations
-          DO iterationIdx2=1,dataProjection%maximumNumberOfIterations 
-            temp1=functionGradientNorm/delta
-            !Estimate if the solution is inside the trust region without calculating a Newton step, this also guarantees
-            !the Hessian matrix is positive definite
-            insideRegion=(minEigen>=temp1).AND.(minEigen>absoluteTolerance) 
-            IF(insideRegion) THEN
-              determinant=minEigen*maxEigen !det(H)
-              hessianDiagonal(1)=functionHessian(1,1)
-              hessianDiagonal(2)=functionHessian(2,2)
-            ELSE
-              eigenShift=MAX(temp1-minEigen,absoluteTolerance) !shift towards steepest decent
-              determinant=temp1*(maxEigen+eigenShift) !det(H)
-              hessianDiagonal(1)=functionHessian(1,1)+eigenShift
-              hessianDiagonal(2)=functionHessian(2,2)+eigenShift
-            ENDIF
-            updateXi(1)=-(hessianDiagonal(2)*functionGradient(1)-functionHessian(1,2)*functionGradient(2))/determinant
-            updateXi(2)=(functionHessian(1,2)*functionGradient(1)-hessianDiagonal(1)*functionGradient(2))/determinant
-            updateXiNorm=DSQRT(DOT_PRODUCT(updateXi,updateXi))
-            free=.TRUE.
-            DO xiIdx=1,2
-              IF((bound(xiIdx)/=0).AND.(bound(xiIdx)>0.EQV.updateXi(xiIdx)>0.0_DP)) THEN
-                !Projection will go out of element bounds
-                IF(.NOT.free) THEN !both xi are fixed
-                  exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
-                  EXIT main_loop
-                ENDIF
-                free=.FALSE.
-                fixedXiIdx=xiIdx
-              ENDIF
-            ENDDO !xiIdx
-            IF(free) THEN
-              !Both xi are free
-              IF(.NOT.insideRegion) THEN
-                IF(updateXiNorm>0.0_DP) THEN
-                  updateXi=delta/updateXiNorm*updateXi !readjust updateXi to lie on the region bound                      
-                ENDIF
-              ENDIF
-            ELSE
-              !xi are not free
-              updateXi(fixedXiIdx)=0.0_DP
-              xiIdx=3-fixedXiIdx
-              insideRegion=.FALSE.
-              IF(functionHessian(xiIdx,xiIdx)>0.0_DP) THEN
-                !Positive: minimum exists in the unbounded direction                
-                updateXi(xiIdx)=-functionGradient(xiIdx)/functionHessian(xiIdx,xiIdx)
-                updateXiNorm=DABS(updateXi(xiIdx))
-                insideRegion=updateXiNorm<=delta
-              ENDIF
-              IF(.NOT.insideRegion) THEN
-                !Minimum not in the region
-                updateXi(xiIdx)=-DSIGN(delta,functionGradient(xiIdx))
-                updateXiNorm=delta
-              ENDIF
-            ENDIF !if xi is free
-            !First half of the convergence test
-            converged=updateXiNorm<absoluteTolerance 
-            newXi=xi+updateXi !update xi
-            DO xiIdx=1,2
-              !Boundary collision check
-              IF(newXi(xiIdx)<0.0_DP) THEN 
-                newXi(xiIdx)=0.0_DP
-                newXi(3-xiIdx)=xi(3-xiIdx)-updateXi(3-xiIdx)*xi(xiIdx)/updateXi(xiIdx)
-              ELSEIF(newXi(xiIdx)>1.0_DP) THEN
-                newXi(xiIdx)=1.0_DP  
-                newXi(3-xiIdx)=xi(3-xiIdx)+updateXi(3-xiIdx)*(1.0_DP-xi(xiIdx))/updateXi(xiIdx)
+    IF(projectionExitTag==DATA_PROJECTION_USER_SPECIFIED) THEN
+      IF(projectionElementNumber==0) CALL FlagError("The projection element number has not been set.",err,error,*999)
+      IF(projectionElementFaceNumber==0) CALL FlagError("The projection element face number has not been set.",err,error,*999)
+      faceNumber=interpolatedPoint%INTERPOLATION_PARAMETERS%field%decomposition%topology%elements% &
+        & elements(projectionElementNumber)%ELEMENT_FACES(projectionElementFaceNumber)
+      CALL Field_InterpolationParametersFaceGet(dataProjection%projectionSetType,faceNumber,interpolatedPoint% &
+        & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+      CALL Field_InterpolateXi(NO_PART_DERIV,projectionXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+      projectionVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
+        & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+      projectionDistance=DSQRT(DOT_PRODUCT(projectionVector(1:numberOfCoordinates),projectionVector(1:numberOfCoordinates)))
+    ELSE
+      projectionExitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+      relativeTolerance=dataProjection%relativeTolerance
+      absoluteTolerance=dataProjection%absoluteTolerance
+      maximumDelta=dataProjection%maximumIterationUpdate
+      minimumDelta=0.025_DP*maximumDelta !need to set a minimum, in case if it gets too small
+      !Project on each candidate elements
+      DO elementIdx=1,SIZE(candidateElements,1) 
+        elementNumber=candidateElements(elementIdx)
+        IF(elementNumber>0) THEN
+          elementFaceNumber=candidateElementFaces(elementIdx)
+          faceNumber=interpolatedPoint%INTERPOLATION_PARAMETERS%field%decomposition%topology%elements% &
+            & elements(elementNumber)%ELEMENT_FACES(elementFaceNumber)     
+          exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+          converged=.FALSE.
+          !start at half the maximumDelta as we do not know if quadratic model is a good approximation yet
+          delta=0.5_DP*maximumDelta 
+          CALL Field_InterpolationParametersFaceGet(dataProjection%projectionSetType,faceNumber,interpolatedPoint% &
+            & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+          xi=projectionXi
+          CALL Field_InterpolateXi(SECOND_PART_DERIV,xi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+          distanceVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
+            & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+          functionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
+          !Outer loop
+          main_loop: DO iterationIdx1=1,dataProjection%maximumNumberOfIterations
+            !Check for bounds [0,1]
+            DO xiIdx=1,2 
+              IF(ABS(xi(xiIdx))<ZERO_TOLERANCE) THEN
+                bound(xiIdx)=-1 !bound at negative direction             
+              ELSEIF(ABS(xi(xiIdx)-1.0_DP)<ZERO_TOLERANCE) THEN
+                bound(xiIdx)=1 !bound at positive direction
+              ELSE 
+                bound(xiIdx)=0 !inside the bounds
               ENDIF
-            ENDDO
-            CALL Field_InterpolateXi(SECOND_PART_DERIV,newXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-            distanceVector=dataPointLocation-interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
-            newFunctionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
-            !Second half of the convergence test (before collision detection)
-            converged=converged.AND.(DABS(newFunctionValue-functionValue)/(1.0_DP+functionValue)<relativeTolerance) 
-            IF(converged) THEN
-              functionValue=newFunctionValue
-              EXIT !converged: exit inner loop first
-            ENDIF
-            IF((newFunctionValue-functionValue)>absoluteTolerance) THEN
-              !Bad model: reduce step size
-              IF(delta<=minimumDelta) THEN
-                !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
-                exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
-                functionValue=newFunctionValue
-                EXIT main_loop
+            ENDDO !xiIdx              
+            !functionGradient 
+            functionGradient(1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1)))
+            functionGradient(2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
+            !functionHessian 
+            functionHessian(1,1)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S1))- &
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1))) 
+            functionHessian(1,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1_S2))- &         
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S1), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
+            functionHessian(2,2)=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2_S2))- &
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2), &
+              & interpolatedPoint%values(1:numberOfCoordinates,PART_DERIV_S2)))
+            !A model trust region approach, a Newton step is taken if the minimum lies inside the trust region (delta),
+            !if not, shift the step towards the steepest descent
+            temp1=0.5_DP*(functionHessian(1,1)+functionHessian(2,2))
+            temp2=DSQRT((0.5_DP*(functionHessian(1,1)-functionHessian(2,2)))**2+functionHessian(1,2)**2)
+            minEigen=temp1-temp2
+            maxEigen=temp1+temp2
+            functionGradientNorm=DSQRT(DOT_PRODUCT(functionGradient,functionGradient))
+            !Inner loop: adjust region size, usually EXIT at 1 or 2 iterations
+            DO iterationIdx2=1,dataProjection%maximumNumberOfIterations 
+              temp1=functionGradientNorm/delta
+              !Estimate if the solution is inside the trust region without calculating a Newton step, this also guarantees
+              !the Hessian matrix is positive definite
+              insideRegion=(minEigen>=temp1).AND.(minEigen>absoluteTolerance) 
+              IF(insideRegion) THEN
+                determinant=minEigen*maxEigen !det(H)
+                hessianDiagonal(1)=functionHessian(1,1)
+                hessianDiagonal(2)=functionHessian(2,2)
+              ELSE
+                eigenShift=MAX(temp1-minEigen,absoluteTolerance) !shift towards steepest decent
+                determinant=temp1*(maxEigen+eigenShift) !det(H)
+                hessianDiagonal(1)=functionHessian(1,1)+eigenShift
+                hessianDiagonal(2)=functionHessian(2,2)+eigenShift
               ENDIF
-              delta=DMAX1(minimumDelta,0.25_DP*delta)
-            ELSE
-              predictedReduction=DOT_PRODUCT(functionGradient,updateXi)+ &
-                & 0.5_DP*(updateXi(1)*(updateXi(1)*functionHessian(1,1)+2.0_DP*updateXi(2)*functionHessian(1,2))+ &
-                & updateXi(2)**2*functionHessian(2,2))
-              predictionAccuracy=(newFunctionValue-functionValue)/predictedReduction
-              IF(predictionAccuracy<0.01_DP) THEN
-                !Bad model: reduce region size
-                IF(delta<=minimumDelta) THEN
-                  !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
-                  exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
-                  functionValue=newFunctionValue
-                  EXIT main_loop
-                ENDIF
-                delta=DMAX1(minimumDelta,0.5_DP*delta)
-              ELSEIF(predictionAccuracy>0.9_DP.AND.predictionAccuracy<1.1_DP) THEN
-                !Good model: increase region size
-                delta=DMIN1(maximumDelta,2.0_DP*delta)
-                functionValue=newFunctionValue
-                EXIT
+              updateXi(1)=-(hessianDiagonal(2)*functionGradient(1)-functionHessian(1,2)*functionGradient(2))/determinant
+              updateXi(2)=(functionHessian(1,2)*functionGradient(1)-hessianDiagonal(1)*functionGradient(2))/determinant
+              updateXiNorm=DSQRT(DOT_PRODUCT(updateXi,updateXi))
+              free=.TRUE.
+              DO xiIdx=1,2
+                IF((bound(xiIdx)/=0).AND.(bound(xiIdx)>0.EQV.updateXi(xiIdx)>0.0_DP)) THEN
+                  !Projection will go out of element bounds
+                  IF(.NOT.free) THEN !both xi are fixed
+                    exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
+                    EXIT main_loop
+                  ENDIF
+                  free=.FALSE.
+                  fixedXiIdx=xiIdx
+                ENDIF
+              ENDDO !xiIdx
+              IF(free) THEN
+                !Both xi are free
+                IF(.NOT.insideRegion) THEN
+                  IF(updateXiNorm>0.0_DP) THEN
+                    updateXi=delta/updateXiNorm*updateXi !readjust updateXi to lie on the region bound                      
+                  ENDIF
+                ENDIF
               ELSE
-                !OK model: keep the current region size
+                !xi are not free
+                updateXi(fixedXiIdx)=0.0_DP
+                xiIdx=3-fixedXiIdx
+                insideRegion=.FALSE.
+                IF(functionHessian(xiIdx,xiIdx)>0.0_DP) THEN
+                  !Positive: minimum exists in the unbounded direction                
+                  updateXi(xiIdx)=-functionGradient(xiIdx)/functionHessian(xiIdx,xiIdx)
+                  updateXiNorm=DABS(updateXi(xiIdx))
+                  insideRegion=updateXiNorm<=delta
+                ENDIF
+                IF(.NOT.insideRegion) THEN
+                  !Minimum not in the region
+                  updateXi(xiIdx)=-DSIGN(delta,functionGradient(xiIdx))
+                  updateXiNorm=delta
+                ENDIF
+              ENDIF !if xi is free
+              !First half of the convergence test
+              converged=updateXiNorm<absoluteTolerance 
+              newXi=xi+updateXi !update xi
+              DO xiIdx=1,2
+                !Boundary collision check
+                IF(newXi(xiIdx)<0.0_DP) THEN 
+                  newXi(xiIdx)=0.0_DP
+                  newXi(3-xiIdx)=xi(3-xiIdx)-updateXi(3-xiIdx)*xi(xiIdx)/updateXi(xiIdx)
+                ELSEIF(newXi(xiIdx)>1.0_DP) THEN
+                  newXi(xiIdx)=1.0_DP  
+                  newXi(3-xiIdx)=xi(3-xiIdx)+updateXi(3-xiIdx)*(1.0_DP-xi(xiIdx))/updateXi(xiIdx)
+                ENDIF
+              ENDDO
+              CALL Field_InterpolateXi(SECOND_PART_DERIV,newXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+              distanceVector=dataPointLocation-interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+              newFunctionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
+              !Second half of the convergence test (before collision detection)
+              converged=converged.AND.(DABS(newFunctionValue-functionValue)/(1.0_DP+functionValue)<relativeTolerance) 
+              IF(converged) THEN
                 functionValue=newFunctionValue
-                EXIT
+                EXIT !converged: exit inner loop first
+              ENDIF
+              IF((newFunctionValue-functionValue)>absoluteTolerance) THEN
+                !Bad model: reduce step size
+                IF(delta<=minimumDelta) THEN
+                  !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
+                  exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
+                  functionValue=newFunctionValue
+                  EXIT main_loop
+                ENDIF
+                delta=DMAX1(minimumDelta,0.25_DP*delta)
+              ELSE
+                predictedReduction=DOT_PRODUCT(functionGradient,updateXi)+ &
+                  & 0.5_DP*(updateXi(1)*(updateXi(1)*functionHessian(1,1)+2.0_DP*updateXi(2)*functionHessian(1,2))+ &
+                  & updateXi(2)**2*functionHessian(2,2))
+                predictionAccuracy=(newFunctionValue-functionValue)/predictedReduction
+                IF(predictionAccuracy<0.01_DP) THEN
+                  !Bad model: reduce region size
+                  IF(delta<=minimumDelta) THEN
+                    !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
+                    exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
+                    functionValue=newFunctionValue
+                    EXIT main_loop
+                  ENDIF
+                  delta=DMAX1(minimumDelta,0.5_DP*delta)
+                ELSEIF(predictionAccuracy>0.9_DP.AND.predictionAccuracy<1.1_DP) THEN
+                  !Good model: increase region size
+                  delta=DMIN1(maximumDelta,2.0_DP*delta)
+                  functionValue=newFunctionValue
+                  EXIT
+                ELSE
+                  !OK model: keep the current region size
+                  functionValue=newFunctionValue
+                  EXIT
+                ENDIF
               ENDIF
+            ENDDO !iterationIdx2 (inner loop: adjust region size)
+            functionValue=newFunctionValue
+            xi=newXi
+            IF(converged) THEN
+              exitTag=DATA_PROJECTION_EXIT_TAG_CONVERGED
+              EXIT
             ENDIF
-          ENDDO !iterationIdx2 (inner loop: adjust region size)
-          functionValue=newFunctionValue
-          xi=newXi
-          IF(converged) THEN
-            exitTag=DATA_PROJECTION_EXIT_TAG_CONVERGED
-            EXIT
+          ENDDO main_loop !iterationIdx1 (outer loop)
+          IF(exitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT.AND.iterationIdx1>=dataProjection%maximumNumberOfIterations) &
+            & exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION
+          IF((projectionExitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT).OR.(DSQRT(functionValue)<projectionDistance)) THEN
+            projectionExitTag=exitTag
+            projectionElementNumber=elementNumber
+            projectionElementFaceNumber=elementFaceNumber            
+            projectionDistance=DSQRT(functionValue)
+            projectionXi=xi
+            projectionVector=distanceVector
           ENDIF
-        ENDDO main_loop !iterationIdx1 (outer loop)
-        IF(exitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT.AND.iterationIdx1>=dataProjection%maximumNumberOfIterations) &
-          & exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION
-        IF((projectionExitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT).OR.(DSQRT(functionValue)<projectionDistance)) THEN
-          projectionExitTag=exitTag
-          projectionElementNumber=elementNumber
-          projectionElementFaceNumber=elementFaceNumber            
-          projectionDistance=DSQRT(functionValue)
-          projectionXi=xi
-          projectionVector=distanceVector
         ENDIF
-      ENDIF
-    ENDDO !elementIdx
+      ENDDO !elementIdx
+    ENDIF
     
     EXITS("DataProjection_NewtonFacesEvaluate")
     RETURN
@@ -3229,7 +3429,7 @@ SUBROUTINE DataProjection_NewtonLinesEvaluate(dataProjection,interpolatedPoint,d
     INTEGER(INTG), INTENT(OUT) :: projectionElementNumber !<On exit, the element number of the data point projection
     INTEGER(INTG), INTENT(OUT) :: projectionElementLineNumber !<On exit, the line number of the data point projection
     REAL(DP), INTENT(OUT) :: projectionDistance !<On exit, the projection distance
-    REAL(DP), INTENT(OUT) :: projectionXi(1) !<projectionXi(xiIdx). On exit, the xi location of the data point projection
+    REAL(DP), INTENT(INOUT) :: projectionXi(1) !<projectionXi(xiIdx). On exit, the xi location of the data point projection
     REAL(DP), INTENT(OUT) :: projectionVector(3) !<projectionVector(componentIdx). On exit, the projection vector for the data point projection
     INTEGER(INTG), INTENT(OUT) :: err !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string   
@@ -3251,133 +3451,146 @@ SUBROUTINE DataProjection_NewtonLinesEvaluate(dataProjection,interpolatedPoint,d
     IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
     IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
     
-    projectionExitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
     numberOfCoordinates=dataProjection%numberOfCoordinates
-    relativeTolerance=dataProjection%relativeTolerance
-    absoluteTolerance=dataProjection%absoluteTolerance
-    maximumDelta=dataProjection%maximumIterationUpdate
-    minimumDelta=0.025_DP*maximumDelta !need to set a minimum, in case if it gets too small
-    !Project on each candidate elements
-    DO elementIdx=1,SIZE(candidateElements,1) 
-      elementNumber=candidateElements(elementIdx)
-      IF(elementNumber>0) THEN
-        elementLineNumber=candidateElementLines(elementIdx)
-        lineNumber=interpolatedPoint%INTERPOLATION_PARAMETERS%field%decomposition%topology%elements% &
-          & elements(elementNumber)%ELEMENT_LINES(elementLineNumber)
-        exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
-        converged=.FALSE.
-        !start at half the maximumDelta as we do not know if quadratic model is a good approximation yet
-        delta=0.5_DP*maximumDelta
-        CALL Field_InterpolationParametersLineGet(dataProjection%projectionSetType,lineNumber,interpolatedPoint% &
-          & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-        xi=dataProjection%startingXi
-        CALL Field_InterpolateXi(SECOND_PART_DERIV,xi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-        distanceVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
-          & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
-        functionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
-        !Outer loop
-        main_loop: DO iterationIdx1=1,dataProjection%maximumNumberOfIterations 
-          !Check for bounds [0,1]
-          IF(ABS(xi(1))<ZERO_TOLERANCE) THEN
-            bound=-1 !bound at negative direction             
-          ELSEIF(ABS(xi(1)-1.0_DP)<ZERO_TOLERANCE) THEN
-            bound=1 !bound at positive direction
-          ELSE 
-            bound=0 !inside the bounds
-          ENDIF
-          !functionGradient 
-          functionGradient=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,FIRST_PART_DERIV)))
-          !functionHessian 
-          functionHessian=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
-            & interpolatedPoint%values(1:numberOfCoordinates,SECOND_PART_DERIV))- &
-            & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,FIRST_PART_DERIV), &
-            & interpolatedPoint%values(1:numberOfCoordinates,FIRST_PART_DERIV)))
-          !A model trust region approach, directly taken from CMISS CLOS22: V = -(H + eigenShift*I)g
-          !The calculation of eigenShift are only approximated as oppose to the common trust region approach
-          !Inner loop: adjust region size, usually EXIT at 1 or 2 iterations
-          DO iterationIdx2=1,dataProjection%maximumNumberOfIterations 
-            insideRegion=.FALSE.
-            IF(functionHessian>absoluteTolerance) THEN
-              !Positive: minimum exists
-              updateXi(1)=-functionGradient/functionHessian
-              updateXiNorm=DABS(updateXi(1))
-              insideRegion=updateXiNorm<=delta
-            ENDIF
-            IF(.NOT.insideRegion) THEN
-              !minimum not in the region
-              updateXi(1)=-DSIGN(delta,functionGradient)
-              updateXiNorm=delta
-            ENDIF
-            IF((bound/=0).AND.(bound>0.EQV.updateXi(1)>0.0_DP)) THEN
-              !Projection will go out of element bounds
-              exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
-              EXIT main_loop
-            ENDIF
-            !First half of the convergence test (before collision detection)
-            converged=updateXiNorm<absoluteTolerance 
-            newXi=xi+updateXi !update xi
-            !Boundary collision check
-            IF(newXi(1)<0.0_DP) THEN 
-              newXi(1)=0.0_DP
-            ELSEIF(newXi(1)>1.0_DP) THEN
-              newXi(1)=1.0_DP  
+    IF(projectionExitTag==DATA_PROJECTION_USER_SPECIFIED) THEN
+      IF(projectionElementNumber==0) CALL FlagError("The projection element number has not been set.",err,error,*999)
+      IF(projectionElementLineNumber==0) CALL FlagError("The projection element line number has not been set.",err,error,*999)
+      lineNumber=interpolatedPoint%INTERPOLATION_PARAMETERS%field%decomposition%topology%elements% &
+        & elements(projectionElementNumber)%ELEMENT_LINES(projectionElementLineNumber)
+      CALL Field_InterpolationParametersLineGet(dataProjection%projectionSetType,lineNumber,interpolatedPoint% &
+        & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+      CALL Field_InterpolateXi(NO_PART_DERIV,projectionXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+      projectionVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
+        & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+      projectionDistance=DSQRT(DOT_PRODUCT(projectionVector(1:numberOfCoordinates),projectionVector(1:numberOfCoordinates)))
+    ELSE
+      projectionExitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+      relativeTolerance=dataProjection%relativeTolerance
+      absoluteTolerance=dataProjection%absoluteTolerance
+      maximumDelta=dataProjection%maximumIterationUpdate
+      minimumDelta=0.025_DP*maximumDelta !need to set a minimum, in case if it gets too small
+      !Project on each candidate elements
+      DO elementIdx=1,SIZE(candidateElements,1) 
+        elementNumber=candidateElements(elementIdx)
+        IF(elementNumber>0) THEN
+          elementLineNumber=candidateElementLines(elementIdx)
+          lineNumber=interpolatedPoint%INTERPOLATION_PARAMETERS%field%decomposition%topology%elements% &
+            & elements(elementNumber)%ELEMENT_LINES(elementLineNumber)
+          exitTag=DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+          converged=.FALSE.
+          !start at half the maximumDelta as we do not know if quadratic model is a good approximation yet
+          delta=0.5_DP*maximumDelta
+          CALL Field_InterpolationParametersLineGet(dataProjection%projectionSetType,lineNumber,interpolatedPoint% &
+            & INTERPOLATION_PARAMETERS,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+          xi=projectionXi
+          CALL Field_InterpolateXi(SECOND_PART_DERIV,xi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+          distanceVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
+            & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+          functionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
+          !Outer loop
+          main_loop: DO iterationIdx1=1,dataProjection%maximumNumberOfIterations 
+            !Check for bounds [0,1]
+            IF(ABS(xi(1))<ZERO_TOLERANCE) THEN
+              bound=-1 !bound at negative direction             
+            ELSEIF(ABS(xi(1)-1.0_DP)<ZERO_TOLERANCE) THEN
+              bound=1 !bound at positive direction
+            ELSE 
+              bound=0 !inside the bounds
             ENDIF
-            CALL Field_InterpolateXi(SECOND_PART_DERIV,newXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
-            distanceVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
-              & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
-            newFunctionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
-            !Second half of the convergence test
-            converged=converged.AND.(DABS(newFunctionValue-functionValue)/(1.0_DP+functionValue)<relativeTolerance) 
-            IF(converged) EXIT !converged: exit inner loop first
-            IF((newFunctionValue-functionValue)>absoluteTolerance) THEN
-              !Bad model: reduce step size
-              IF(delta<=minimumDelta) THEN
-                !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
-                exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
+            !functionGradient 
+            functionGradient=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,FIRST_PART_DERIV)))
+            !functionHessian 
+            functionHessian=-2.0_DP*(DOT_PRODUCT(distanceVector(1:numberOfCoordinates), &
+              & interpolatedPoint%values(1:numberOfCoordinates,SECOND_PART_DERIV))- &
+              & DOT_PRODUCT(interpolatedPoint%values(1:numberOfCoordinates,FIRST_PART_DERIV), &
+              & interpolatedPoint%values(1:numberOfCoordinates,FIRST_PART_DERIV)))
+            !A model trust region approach, directly taken from CMISS CLOS22: V = -(H + eigenShift*I)g
+            !The calculation of eigenShift are only approximated as oppose to the common trust region approach
+            !Inner loop: adjust region size, usually EXIT at 1 or 2 iterations
+            DO iterationIdx2=1,dataProjection%maximumNumberOfIterations 
+              insideRegion=.FALSE.
+              IF(functionHessian>absoluteTolerance) THEN
+                !Positive: minimum exists
+                updateXi(1)=-functionGradient/functionHessian
+                updateXiNorm=DABS(updateXi(1))
+                insideRegion=updateXiNorm<=delta
+              ENDIF
+              IF(.NOT.insideRegion) THEN
+                !minimum not in the region
+                updateXi(1)=-DSIGN(delta,functionGradient)
+                updateXiNorm=delta
+              ENDIF
+              IF((bound/=0).AND.(bound>0.EQV.updateXi(1)>0.0_DP)) THEN
+                !Projection will go out of element bounds
+                exitTag=DATA_PROJECTION_EXIT_TAG_BOUNDS
                 EXIT main_loop
               ENDIF
-              delta=DMAX1(minimumDelta,0.25_DP*delta)
-            ELSE
-              predictedReduction=updateXi(1)*(functionGradient+0.5_DP*functionHessian*updateXi(1))
-              predictionAccuracy=(newFunctionValue-functionValue)/predictedReduction
-              IF(predictionAccuracy<0.01_DP) THEN
-                !Bad model: reduce region size
+              !First half of the convergence test (before collision detection)
+              converged=updateXiNorm<absoluteTolerance 
+              newXi=xi+updateXi !update xi
+              !Boundary collision check
+              IF(newXi(1)<0.0_DP) THEN 
+                newXi(1)=0.0_DP
+              ELSEIF(newXi(1)>1.0_DP) THEN
+                newXi(1)=1.0_DP  
+              ENDIF
+              CALL Field_InterpolateXi(SECOND_PART_DERIV,newXi,interpolatedPoint,err,error,*999,FIELD_GEOMETRIC_COMPONENTS_TYPE)
+              distanceVector(1:numberOfCoordinates)=dataPointLocation(1:numberOfCoordinates)- &
+                & interpolatedPoint%values(1:numberOfCoordinates,NO_PART_DERIV)
+              newFunctionValue=DOT_PRODUCT(distanceVector(1:numberOfCoordinates),distanceVector(1:numberOfCoordinates))
+              !Second half of the convergence test
+              converged=converged.AND.(DABS(newFunctionValue-functionValue)/(1.0_DP+functionValue)<relativeTolerance) 
+              IF(converged) EXIT !converged: exit inner loop first
+              IF((newFunctionValue-functionValue)>absoluteTolerance) THEN
+                !Bad model: reduce step size
                 IF(delta<=minimumDelta) THEN
                   !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
                   exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
                   EXIT main_loop
                 ENDIF
-                delta=DMAX1(minimumDelta,0.5_DP*delta)
-              ELSEIF(predictionAccuracy>0.9_DP.AND.predictionAccuracy<1.1_DP) THEN
-                !Good model: increase region size
-                delta=DMIN1(maximumDelta,2.0_DP*delta)
-                EXIT
+                delta=DMAX1(minimumDelta,0.25_DP*delta)
               ELSE
-                !OK model: keep the current region size
-                EXIT
+                predictedReduction=updateXi(1)*(functionGradient+0.5_DP*functionHessian*updateXi(1))
+                predictionAccuracy=(newFunctionValue-functionValue)/predictedReduction
+                IF(predictionAccuracy<0.01_DP) THEN
+                  !Bad model: reduce region size
+                  IF(delta<=minimumDelta) THEN
+                    !Something went wrong, minimumDelta too large? not likely to happen if minimumDelta is small
+                    exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !it will get stucked!!
+                    EXIT main_loop
+                  ENDIF
+                  delta=DMAX1(minimumDelta,0.5_DP*delta)
+                ELSEIF(predictionAccuracy>0.9_DP.AND.predictionAccuracy<1.1_DP) THEN
+                  !Good model: increase region size
+                  delta=DMIN1(maximumDelta,2.0_DP*delta)
+                  EXIT
+                ELSE
+                  !OK model: keep the current region size
+                  EXIT
+                ENDIF
               ENDIF
+            ENDDO !iterationIdx2 (inner loop: adjust region size)
+            functionValue=newFunctionValue
+            xi=newXi
+            IF(converged) THEN
+              exitTag=DATA_PROJECTION_EXIT_TAG_CONVERGED
+              EXIT
             ENDIF
-          ENDDO !iterationIdx2 (inner loop: adjust region size)
-          functionValue=newFunctionValue
-          xi=newXi
-          IF(converged) THEN
-            exitTag=DATA_PROJECTION_EXIT_TAG_CONVERGED
-            EXIT
+          ENDDO main_loop !iterationIdx1 (outer loop)
+          IF(exitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT.AND.iterationIdx1>=dataProjection%maximumNumberOfIterations) &
+            & exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION
+          IF((projectionExitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT).OR.(DSQRT(functionValue)<projectionDistance)) THEN
+            projectionExitTag=exitTag
+            projectionElementNumber=elementNumber
+            projectionElementLineNumber=elementLineNumber
+            projectionDistance=DSQRT(functionValue)
+            projectionXi=xi
+            projectionVector=distanceVector
           ENDIF
-        ENDDO main_loop !iterationIdx1 (outer loop)
-        IF(exitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT.AND.iterationIdx1>=dataProjection%maximumNumberOfIterations) &
-          & exitTag=DATA_PROJECTION_EXIT_TAG_MAX_ITERATION
-        IF((projectionExitTag==DATA_PROJECTION_EXIT_TAG_NO_ELEMENT).OR.(DSQRT(functionValue)<projectionDistance)) THEN
-          projectionExitTag=exitTag
-          projectionElementNumber=elementNumber
-          projectionElementLineNumber=elementLineNumber
-          projectionDistance=DSQRT(functionValue)
-          projectionXi=xi
-          projectionVector=distanceVector
         ENDIF
-      ENDIF
-    ENDDO !elementIdx
+      ENDDO !elementIdx
+    ENDIF
     
     EXITS("DataProjection_NewtonLinesEvaluate")
     RETURN
@@ -3495,13 +3708,7 @@ SUBROUTINE DataProjection_ProjectionCancelByDataPoints1(dataProjection,dataPoint
     DO dataPointIdx=1,SIZE(dataPointUserNumbers,1)
       CALL DataProjection_DataPointGlobalNumberGet(dataProjection,dataPointUserNumbers(dataPointIdx),dataPointGlobalNumber, &
         & err,error,*999)
-      dataProjection%dataProjectionResults(dataPointGlobalNumber)%exitTag=DATA_PROJECTION_CANCELLED
-      dataProjection%dataProjectionResults(dataPointIdx)%elementNumber=0
-      dataProjection%dataProjectionResults(dataPointIdx)%elementLineFaceNumber=0
-      dataProjection%dataProjectionResults(dataPointIdx)%xi=0.0_DP
-      dataProjection%dataProjectionResults(dataPointIdx)%elementXi=0.0_DP
-      dataProjection%dataProjectionResults(dataPointIdx)%distance=0.0_DP
-      dataProjection%dataProjectionResults(dataPointIdx)%projectionVector=0.0_DP          
+      CALL DataProjection_DataProjectionResultCancel(dataProjection%dataProjectionResults(dataPointGlobalNumber),err,error,*999)
     ENDDO !dataPointIdx
     
     !Re-evaluate errors
@@ -3547,49 +3754,25 @@ SUBROUTINE DataProjection_ProjectionCancelByDistance(dataProjection,distanceRela
     CASE(DATA_PROJECTION_DISTANCE_GREATER)
       DO dataPointIdx=1,dataPoints%numberOfDataPoints
         IF(dataProjection%dataProjectionResults(dataPointIdx)%distance>distance) THEN
-          dataProjection%dataProjectionResults(dataPointIdx)%exitTag=DATA_PROJECTION_CANCELLED
-          dataProjection%dataProjectionResults(dataPointIdx)%elementNumber=0
-          dataProjection%dataProjectionResults(dataPointIdx)%elementLineFaceNumber=0
-          dataProjection%dataProjectionResults(dataPointIdx)%xi=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%elementXi=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%distance=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%projectionVector=0.0_DP          
+          CALL DataProjection_DataProjectionResultCancel(dataProjection%dataProjectionResults(dataPointIdx),err,error,*999)
         ENDIF
       ENDDO !dataPointIdx
     CASE(DATA_PROJECTION_DISTANCE_GREATER_EQUAL)
       DO dataPointIdx=1,dataPoints%numberOfDataPoints
         IF(dataProjection%dataProjectionResults(dataPointIdx)%distance>=distance) THEN
-          dataProjection%dataProjectionResults(dataPointIdx)%exitTag=DATA_PROJECTION_CANCELLED
-          dataProjection%dataProjectionResults(dataPointIdx)%elementNumber=0
-          dataProjection%dataProjectionResults(dataPointIdx)%elementLineFaceNumber=0
-          dataProjection%dataProjectionResults(dataPointIdx)%xi=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%elementXi=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%distance=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%projectionVector=0.0_DP          
+          CALL DataProjection_DataProjectionResultCancel(dataProjection%dataProjectionResults(dataPointIdx),err,error,*999)
         ENDIF
       ENDDO !dataPointIdx
     CASE(DATA_PROJECTION_DISTANCE_LESS)
       DO dataPointIdx=1,dataPoints%numberOfDataPoints
         IF(dataProjection%dataProjectionResults(dataPointIdx)%distance<distance) THEN
-          dataProjection%dataProjectionResults(dataPointIdx)%exitTag=DATA_PROJECTION_CANCELLED
-          dataProjection%dataProjectionResults(dataPointIdx)%elementNumber=0
-          dataProjection%dataProjectionResults(dataPointIdx)%elementLineFaceNumber=0
-          dataProjection%dataProjectionResults(dataPointIdx)%xi=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%elementXi=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%distance=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%projectionVector=0.0_DP          
+          CALL DataProjection_DataProjectionResultCancel(dataProjection%dataProjectionResults(dataPointIdx),err,error,*999)
         ENDIF
       ENDDO !dataPointIdx
     CASE(DATA_PROJECTION_DISTANCE_LESS_EQUAL)
       DO dataPointIdx=1,dataPoints%numberOfDataPoints
         IF(dataProjection%dataProjectionResults(dataPointIdx)%distance<=distance) THEN
-          dataProjection%dataProjectionResults(dataPointIdx)%exitTag=DATA_PROJECTION_CANCELLED
-          dataProjection%dataProjectionResults(dataPointIdx)%elementNumber=0
-          dataProjection%dataProjectionResults(dataPointIdx)%elementLineFaceNumber=0
-          dataProjection%dataProjectionResults(dataPointIdx)%xi=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%elementXi=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%distance=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%projectionVector=0.0_DP          
+          CALL DataProjection_DataProjectionResultCancel(dataProjection%dataProjectionResults(dataPointIdx),err,error,*999)
         ENDIF
       ENDDO !dataPointIdx
     CASE DEFAULT
@@ -3675,13 +3858,7 @@ SUBROUTINE DataProjection_ProjectionCancelByExitTags1(dataProjection,exitTags,er
     DO dataPointIdx=1,dataPoints%numberOfDataPoints
       DO tagIdx=1,SIZE(exitTags,1)
         IF(dataProjection%dataProjectionResults(dataPointIdx)%exitTag==exitTags(tagIdx)) THEN
-          dataProjection%dataProjectionResults(dataPointIdx)%exitTag=DATA_PROJECTION_CANCELLED
-          dataProjection%dataProjectionResults(dataPointIdx)%elementNumber=0
-          dataProjection%dataProjectionResults(dataPointIdx)%elementLineFaceNumber=0
-          dataProjection%dataProjectionResults(dataPointIdx)%xi=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%elementXi=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%distance=0.0_DP
-          dataProjection%dataProjectionResults(dataPointIdx)%projectionVector=0.0_DP          
+          CALL DataProjection_DataProjectionResultCancel(dataProjection%dataProjectionResults(dataPointIdx),err,error,*999)
         ENDIF
       ENDDO !tagIdx
     ENDDO !dataPointIdx
@@ -4310,7 +4487,7 @@ SUBROUTINE DataProjection_ProjectionTypeSet(dataProjection,projectionType,err,er
     INTEGER(INTG), INTENT(OUT) :: err !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
     !Local Variables
-    REAL(DP), ALLOCATABLE :: startingXi(:)
+    REAL(DP), ALLOCATABLE :: startingXi(:,:)
     
     ENTERS("DataProjection_ProjectionTypeSet",err,error,*999)
 
@@ -4329,18 +4506,13 @@ SUBROUTINE DataProjection_ProjectionTypeSet(dataProjection,projectionType,err,er
       CALL FlagError("Input projection type is undefined.",err,error,*999)
     END SELECT
     IF(dataProjection%numberOfXi/=SIZE(dataProjection%startingXi,1)) THEN
-      ALLOCATE(startingXi(dataProjection%numberOfXi),STAT=err)
+      ALLOCATE(startingXi(dataProjection%datapoints%numberOfDatapoints,dataProjection%numberOfXi),STAT=err)
       IF(err/=0) CALL FlagError("Could not allocate starting xi.",err,error,*999)
-      IF(dataProjection%numberOfXi>SIZE(dataProjection%startingXi,1)) THEN
-        startingXi(1:SIZE(dataProjection%startingXi,1))=dataProjection%startingXi(1:SIZE(dataProjection%startingXi,1))
-        startingXi(SIZE(dataProjection%startingXi,1):dataProjection%numberOfXi)=0.5_DP
-      ELSE
-        startingXi(1:SIZE(dataProjection%startingXi,1))=dataProjection%startingXi(1:dataProjection%numberOfXi)
-      ENDIF
+      startingXi=0.5_DP
       IF(ALLOCATED(dataProjection%startingXi)) DEALLOCATE(dataProjection%startingXi)
-      ALLOCATE(dataProjection%startingXi(dataProjection%numberOfXi),STAT=err)
+      ALLOCATE(dataProjection%startingXi(1:dataProjection%datapoints%numberOfDatapoints,dataProjection%numberOfXi),STAT=err)
       IF(err/=0) CALL FlagError("Could not allocate data projection starting xi.",err,error,*999)
-      dataProjection%startingXi(1:dataProjection%numberOfXi)=startingXi(1:dataProjection%numberOfXi)
+      dataProjection%startingXi=startingXi
       DEALLOCATE(startingXi)
     ENDIF
     
@@ -4418,7 +4590,7 @@ SUBROUTINE DataProjection_StartingXiGet(dataProjection,startingXi,err,error,*)
 
     !Argument variables
     TYPE(DataProjectionType), POINTER :: dataProjection !<A pointer to the data projection to get the starting xi for
-    REAL(DP), INTENT(OUT) :: startingXi(:) !<On exit, the starting xi of the specified data projection
+    REAL(DP), INTENT(OUT) :: startingXi(:,:) !<On exit, the starting xi of the specified data projection
     INTEGER(INTG), INTENT(OUT) :: err !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
     !Local Variables
@@ -4428,13 +4600,14 @@ SUBROUTINE DataProjection_StartingXiGet(dataProjection,startingXi,err,error,*)
 
     IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
     IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
-    IF(SIZE(startingXi,1)<SIZE(dataProjection%startingXi,1)) THEN
+    IF(SIZE(startingXi,2)<SIZE(dataProjection%startingXi,2)) THEN
       localError="The size of the specified starting xi array of "//TRIM(NumberToVString(SIZE(startingXi,1),"*",err,error))// &
         & " is too small. The size must be >= "//TRIM(NumberToVString(SIZE(dataProjection%startingXi,1),"*",err,error))//"."
       CALL FlagError(localError,err,error,*999)
     ENDIF
     
-    startingXi(1:SIZE(dataProjection%startingXi,1))=dataProjection%startingXi(1:SIZE(dataProjection%startingXi,1))
+    startingXi(1:dataProjection%datapoints%numberOfDatapoints,1:SIZE(dataProjection%startingXi,1))=&
+      & dataProjection%startingXi(1:dataProjection%datapoints%numberOfDatapoints,1:SIZE(dataProjection%startingXi,1))
     
     EXITS("DataProjection_StartingXiGet")
     RETURN
@@ -4452,11 +4625,11 @@ SUBROUTINE DataProjection_StartingXiSet(dataProjection,startingXi,err,error,*)
 
     !Argument variables
     TYPE(DataProjectionType), POINTER :: dataProjection !<A pointer to the data projection to set the starting xi for
-    REAL(DP), INTENT(IN) :: startingXi(:) !<The starting xi to set
+    REAL(DP), INTENT(IN) :: startingXi(:,:) !<The starting xi to set
     INTEGER(INTG), INTENT(OUT) :: err !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
     !Local Variables
-    INTEGER(INTG) :: xiIdx
+    INTEGER(INTG) :: datapoint,xiIdx
     LOGICAL :: validInput
     TYPE(VARYING_STRING) :: localError
     
@@ -4464,25 +4637,33 @@ SUBROUTINE DataProjection_StartingXiSet(dataProjection,startingXi,err,error,*)
 
     IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
     IF(dataProjection%dataProjectionFinished) CALL FlagError("Data projection has been finished.",err,error,*999)
-    IF(SIZE(startingXi,1)/=dataProjection%numberOfXi) THEN
-      localError="The size of the specified xi array of "//TRIM(NumberToVString(SIZE(startingXi,1),"*",err,error))// &
-        & " is invalid. The size should be "//TRIM(NumberToVString(dataProjection%numberOfXi,"*",err,error))//"."
+    IF(SIZE(startingXi,1)/=dataProjection%datapoints%numberOfDatapoints) THEN
+      localError="The number of datapoints in the specified xi array of "//TRIM(NumberToVString(SIZE(startingXi,1),"*", &
+        & err,error))//" is invalid. The number of datapoints should be "// &
+        & TRIM(NumberToVString(dataProjection%datapoints%numberOfDatapoints,"*",err,error))//"."
+      CALL FlagError(localError,err,error,*999)
+    ENDIF
+    IF(SIZE(startingXi,2)/=dataProjection%numberOfXi) THEN
+      localError="The number of xi in the specified xi array of "//TRIM(NumberToVString(SIZE(startingXi,2),"*",err,error))// &
+        & " is invalid. The number of xi should be "//TRIM(NumberToVString(dataProjection%numberOfXi,"*",err,error))//"."
       CALL FlagError(localError,err,error,*999)
     ENDIF
     validInput=.TRUE.
-    DO xiIdx=1,dataProjection%numberOfXi
-      IF((startingXi(xiIdx)<0.0_DP).OR.(startingXi(xiIdx)>1.0_DP)) THEN
-        validInput=.FALSE.
-        EXIT !this do
-      ENDIF
-    ENDDO !xiIdx
+    DO datapoint=1,dataProjection%datapoints%numberOfDatapoints
+      DO xiIdx=1,dataProjection%numberOfXi
+        IF((startingXi(datapoint,xiIdx)<0.0_DP).OR.(startingXi(datapoint,xiIdx)>1.0_DP)) THEN
+          validInput=.FALSE.
+          EXIT !this do
+        ENDIF
+      ENDDO !xiIdx
+    ENDDO !datapoint
     IF(.NOT.validInput) CALL FlagError("Data projection starting xi must be between 0.0 and 1.0.",err,error,*999)
     
-    dataProjection%startingXi(1:SIZE(startingXi))=startingXi(1:SIZE(startingXi))
+    dataProjection%startingXi(1:SIZE(startingXi,1), 1:SIZE(startingXi,2))=startingXi
     
     EXITS("DataProjection_StartingXiSet")
     RETURN
-999 ERRORSEXITS("DataProjection_StartingXiSet",err,error)    
+999 ERRORSEXITS("DataProjection_StartingXiSet",err,error)
     RETURN 1
 
   END SUBROUTINE DataProjection_StartingXiSet
@@ -4521,7 +4702,7 @@ SUBROUTINE DataProjection_ElementSet(dataProjection,dataPointUserNumber,elementU
           & " cannot be set as a projection element as it is a ghost element."
         CALL FlagError(localError,err,error,*999)
       ELSE
-        dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementNumber=elementUserNumber
+        dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementLocalNumber=localElementNumber
       ENDIF
     ELSE
       localError="The specificed user element number of "//TRIM(NumberToVString(elementUserNumber,"*",err,error))// &
@@ -4697,7 +4878,8 @@ SUBROUTINE DataProjection_ResultAnalysisOutput(dataProjection,filename,err,error
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
     !Local Variables
     INTEGER(INTG) :: dataPointExitTag,dataPointIdx,dataPointUserNumber,elementUserNumber,filenameLength,localElementNumber, &
-      & localLineFaceNumber,myComputationalNodeNumber,normalIdx1,normalIdx2,numberOfComputationalNodes,outputID
+      & localLineFaceNumber,myComputationalNodeNumber,normalIdx1,normalIdx2,numberOfCanceledDataPoints, &
+      & numberOfComputationalNodes,outputID
     REAL(DP) :: distance
     CHARACTER(LEN=MAXSTRLEN) :: analFilename,format1,format2,localString
     TYPE(BASIS_TYPE), POINTER :: basis
@@ -4776,14 +4958,16 @@ SUBROUTINE DataProjection_ResultAnalysisOutput(dataProjection,filename,err,error
         CALL FlagError(localError,err,error,*999)
       END SELECT
       CALL WriteString(outputID,localString,err,error,*999)
+      numberOfCanceledDataPoints=0
       DO dataPointIdx=1,dataPoints%numberOfDataPoints
         dataPointUserNumber=dataProjection%dataProjectionResults(dataPointIdx)%userNumber
         dataPointExitTag=dataProjection%dataProjectionResults(dataPointIdx)%exitTag
         IF(dataPointExitTag==DATA_PROJECTION_CANCELLED) THEN
+          numberOfCanceledDataPoints=numberOfCanceledDataPoints+1
           WRITE(localString,'(2X,I8,2X,I8,8X,I2)') dataPointIdx,dataPointUserNumber,dataPointExitTag
           CALL WriteString(outputID,localString,err,error,*999)
         ELSE
-          localElementNumber=dataProjection%dataProjectionResults(dataPointIdx)%elementNumber
+          localElementNumber=dataProjection%dataProjectionResults(dataPointIdx)%elementLocalNumber
           elementUserNumber=decompositionElements%elements(localElementNumber)%USER_NUMBER
           localLineFaceNumber=dataProjection%dataProjectionResults(dataPointIdx)%elementLineFaceNumber
           distance=dataProjection%dataProjectionResults(dataPointIdx)%distance
@@ -4841,17 +5025,23 @@ SUBROUTINE DataProjection_ResultAnalysisOutput(dataProjection,filename,err,error
         ENDIF
       ENDDO !dataPointIdx
       CALL WriteString(outputID,"",err,error,*999)
+      CALL WriteStringValue(outputID,"  Number of canceled data points = ",numberOfCanceledDataPoints,err,error,*999)
+      CALL WriteString(outputID,"",err,error,*999)
       CALL WriteString(outputID,"  Errors:",err,error,*999)
       CALL WriteString(outputID,"",err,error,*999)
       CALL WriteString(outputID,"  Error type            Value  Data user#",err,error,*999)
       WRITE(localString,'("  RMS error    ",2X,E12.5)') dataProjection%rmsError
       CALL WriteString(outputID,localString,err,error,*999)
-      WRITE(localString,'("  Maximum error",2X,E12.5,4X,I8)') dataProjection%maximumError, &
-        & dataProjection%dataProjectionResults(dataProjection%maximumErrorDataPoint)%userNumber
-      CALL WriteString(outputID,localString,err,error,*999)
-      WRITE(localString,'("  Minimum error",2X,E12.5,4X,I8)') dataProjection%minimumError, &
-        & dataProjection%dataProjectionResults(dataProjection%minimumErrorDataPoint)%userNumber
-      CALL WriteString(outputID,localString,err,error,*999)
+      IF(dataProjection%maximumErrorDataPoint/=0) THEN
+        WRITE(localString,'("  Maximum error",2X,E12.5,4X,I8)') dataProjection%maximumError, &
+          & dataProjection%dataProjectionResults(dataProjection%maximumErrorDataPoint)%userNumber
+        CALL WriteString(outputID,localString,err,error,*999)
+      ENDIF
+      IF(dataProjection%minimumErrorDataPoint/=0) THEN
+        WRITE(localString,'("  Minimum error",2X,E12.5,4X,I8)') dataProjection%minimumError, &
+          & dataProjection%dataProjectionResults(dataProjection%minimumErrorDataPoint)%userNumber
+        CALL WriteString(outputID,localString,err,error,*999)
+      ENDIF
       CALL WriteString(outputID,"",err,error,*999)
     ENDIF
     IF(filenameLength>=1) THEN
@@ -4889,7 +5079,8 @@ SUBROUTINE DataProjection_ResultElementNumberGet(dataProjection,dataPointUserNum
     IF(.NOT.dataProjection%dataProjectionProjected) CALL FlagError("Data projection has not been projected.",err,error,*999)
     
     CALL DataProjection_DataPointGlobalNumberGet(dataProjection,dataPointUserNumber,dataPointGlobalNumber,err,error,*999)
-    projectionElementNumber=dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementNumber
+!!TODO: this should return the element user number
+    projectionElementNumber=dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementGlobalNumber
  
     EXITS("DataProjection_ResultElementNumberGet")
     RETURN
@@ -4902,6 +5093,76 @@ END SUBROUTINE DataProjection_ResultElementNumberGet
   !================================================================================================================================
   !
 
+  !>Sets the projection element number for a data point identified by a given global number.
+  SUBROUTINE DataProjection_ResultElementNumberSet(dataProjection,dataPointUserNumber,projectionElementUserNumber,err,error,*)
+
+    !Argument variables
+    TYPE(DataProjectionType), POINTER :: dataProjection !<A pointer to the data projection for which projection result is stored
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The data projection user number to set the projection element number for
+    INTEGER(INTG), INTENT(IN) :: projectionElementUserNumber !<The projection element user number of the specified global data point to set
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code
+    TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
+    !Local Variables
+    INTEGER(INTG) :: dataPointGlobalNumber,elementLocalNumber
+    LOGICAL :: elementExists,ghostElement
+    TYPE(BASIS_TYPE), POINTER :: basis
+    TYPE(DECOMPOSITION_TYPE), POINTER :: decomposition
+    TYPE(DECOMPOSITION_ELEMENTS_TYPE), POINTER :: decompositionElements
+    TYPE(DECOMPOSITION_TOPOLOGY_TYPE), POINTER :: decompositionTopology
+    TYPE(DOMAIN_TYPE), POINTER :: domain
+    TYPE(DOMAIN_ELEMENTS_TYPE), POINTER :: domainElements
+    TYPE(DOMAIN_TOPOLOGY_TYPE), POINTER :: domainTopology
+    TYPE(VARYING_STRING) :: localError
+   
+    ENTERS("DataProjection_ResultElementNumberSet",err,error,*999)
+
+    IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
+    IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
+    !IF(dataProjection%dataProjectionProjected) CALL FlagError("Data projection has already been projected.",err,error,*999)
+    
+    SELECT CASE(dataProjection%projectionType)
+    CASE(DATA_PROJECTION_BOUNDARY_FACES_PROJECTION_TYPE)
+      CALL FlagError("Use the result element faces routine not the element routine for a boundary faces projection.", &
+        & err,error,*999)
+    CASE(DATA_PROJECTION_BOUNDARY_LINES_PROJECTION_TYPE)
+      CALL FlagError("Use the result element lines routine not the element routine for a boundary lines projection.", &
+        & err,error,*999)
+    CASE(DATA_PROJECTION_ALL_ELEMENTS_PROJECTION_TYPE)
+      CALL DataProjection_DataPointGlobalNumberGet(dataProjection,dataPointUserNumber,dataPointGlobalNumber,err,error,*999)
+      NULLIFY(decomposition)
+      CALL DataProjection_DecompositionGet(dataProjection,decomposition,err,error,*999)
+      NULLIFY(decompositionTopology)
+      CALL Decomposition_TopologyGet(decomposition,decompositionTopology,err,error,*999)
+      CALL DecompositionTopology_ElementCheckExists(decompositionTopology,projectionElementUserNumber,elementExists, &
+        & elementLocalNumber,ghostElement,err,error,*999)       
+      IF(elementExists) THEN
+        IF(.NOT.ghostElement) THEN
+          dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementLocalNumber=elementLocalNumber
+          dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementGlobalNumber=elementLocalNumber
+          dataProjection%dataProjectionResults(dataPointGlobalNumber)%exitTag=DATA_PROJECTION_USER_SPECIFIED
+        ENDIF
+      ELSE
+        localError="Element user number "//TRIM(NumberToVString(projectionElementUserNumber,"*",err,error))// &
+          & " does not exist."
+        CALL FlagError(localError,err,error,*999)
+      ENDIF
+    CASE DEFAULT
+      localError="The data projection type of "//TRIM(NumberToVString(dataProjection%projectionType,"",err,error))// &
+        & " is invalid."
+      CALL FlagError(localError,err,error,*999)
+    END SELECT
+      
+    EXITS("DataProjection_ResultElementNumberSet")
+    RETURN
+999 ERRORSEXITS("DataProjection_ResultElementNumberSet",err,error)    
+    RETURN 1
+
+  END SUBROUTINE DataProjection_ResultElementNumberSet
+  
+  !
+  !================================================================================================================================
+  !
+
   !>Gets the projection element face number for a data point identified by a given global number.
   SUBROUTINE DataProjection_ResultElementFaceNumberGet(dataProjection,dataPointUserNumber,projectionElementFaceNumber &
     & ,err,error,*)
@@ -4940,6 +5201,86 @@ END SUBROUTINE DataProjection_ResultElementFaceNumberGet
   !================================================================================================================================
   !
 
+  !>Sets the projection element face number for a data point identified by a given global number.
+  SUBROUTINE DataProjection_ResultElementFaceNumberSet(dataProjection,dataPointUserNumber,elementUserNumber,localFaceNormal, &
+    & err,error,*)
+
+    !Argument variables
+    TYPE(DataProjectionType), POINTER :: dataProjection !<A pointer to the data projection for which projection result is stored
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The Data projection user number to get the projection element face number for
+    INTEGER(INTG), INTENT(IN) :: elementUserNumber !<The projection candidate user element number to set the result
+    INTEGER(INTG), INTENT(IN) :: localFaceNormal !<The projection candidate element face normal to set the result for
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code
+    TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
+    !Local Variables
+    INTEGER(INTG) :: dataPointGlobalNumber,elementLocalNumber,localFaceNumber
+    LOGICAL :: elementExists,ghostElement
+    TYPE(BASIS_TYPE), POINTER :: basis
+    TYPE(DECOMPOSITION_TYPE), POINTER :: decomposition
+    TYPE(DECOMPOSITION_TOPOLOGY_TYPE), POINTER :: decompositionTopology
+    TYPE(DOMAIN_TYPE), POINTER :: domain
+    TYPE(DOMAIN_ELEMENTS_TYPE), POINTER :: domainElements
+    TYPE(DOMAIN_TOPOLOGY_TYPE), POINTER :: domainTopology
+    TYPE(VARYING_STRING) :: localError
+    
+    ENTERS("DataProjection_ResultElementFaceNumberSet",err,error,*999)
+
+    IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
+    IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
+    IF(dataProjection%dataProjectionProjected) CALL FlagError("Data projection has already been projected.",err,error,*999)
+
+    SELECT CASE(dataProjection%projectionType)
+    CASE(DATA_PROJECTION_BOUNDARY_LINES_PROJECTION_TYPE)
+      CALL FlagError("Use the result element lines routine not the element faces routine for a boundary faces projection.", &
+        & err,error,*999)
+    CASE(DATA_PROJECTION_ALL_ELEMENTS_PROJECTION_TYPE)
+      CALL FlagError("Use the result elements routine not the element faces routine for an all elements projection.", &
+        & err,error,*999)
+    CASE(DATA_PROJECTION_BOUNDARY_FACES_PROJECTION_TYPE)
+      NULLIFY(decomposition)
+      CALL DataProjection_DecompositionGet(dataProjection,decomposition,err,error,*999)
+      NULLIFY(decompositionTopology)
+      CALL Decomposition_TopologyGet(decomposition,decompositionTopology,err,error,*999)
+      NULLIFY(domain)
+      CALL Decomposition_DomainGet(decomposition,0,domain,err,error,*999)
+      NULLIFY(domainTopology)
+      CALL Domain_TopologyGet(domain,domainTopology,err,error,*999)
+      NULLIFY(domainElements)
+      CALL DomainTopology_ElementsGet(domainTopology,domainElements,err,error,*999)
+      CALL DataProjection_DataPointGlobalNumberGet(dataProjection,dataPointUserNumber,dataPointGlobalNumber,err,error,*999)
+      CALL DecompositionTopology_ElementCheckExists(decompositionTopology,elementUserNumber,elementExists, &
+        & elementLocalNumber,ghostElement,err,error,*999)       
+      IF(elementExists) THEN
+        IF(.NOT.ghostElement) THEN
+          NULLIFY(basis)
+          CALL DomainElements_BasisGet(domainElements,elementLocalNumber,basis,err,error,*999)
+          CALL Basis_LocalFaceNumberGet(basis,localFaceNormal,localFaceNumber,err,error,*999)
+          dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementLocalNumber=elementLocalNumber
+          dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementLineFaceNumber=localFaceNumber
+          dataProjection%dataProjectionResults(dataPointGlobalNumber)%exitTag=DATA_PROJECTION_USER_SPECIFIED
+        ENDIF
+      ELSE
+        localError="Element user number "//TRIM(NumberToVString(elementUserNumber,"*",err,error))// &
+          & " does not exist."
+        CALL FlagError(localError,err,error,*999)
+      ENDIF
+    CASE DEFAULT
+      localError="The data projection type of "//TRIM(NumberToVString(dataProjection%projectionType,"",err,error))// &
+        & " is invalid."
+      CALL FlagError(localError,err,error,*999)
+    END SELECT
+
+    EXITS("DataProjection_ResultElementFaceNumberSet")
+    RETURN
+999 ERRORSEXITS("DataProjection_ResultElementFaceNumberSet",err,error)    
+    RETURN 1
+
+  END SUBROUTINE DataProjection_ResultElementFaceNumberSet
+
+  !
+  !================================================================================================================================
+  !
+
   !>Gets the projection element line number for a data point identified by a given global number.
   SUBROUTINE DataProjection_ResultElementLineNumberGet(dataProjection,dataPointUserNumber,projectionElementLineNumber &
     & ,err,error,*)
@@ -4978,6 +5319,130 @@ END SUBROUTINE DataProjection_ResultElementLineNumberGet
   !================================================================================================================================
   !
 
+  !>Sets the projection element line number for a data point identified by a given global number.
+  SUBROUTINE DataProjection_ResultElementLineNumberSet(dataProjection,dataPointUserNumber,elementUserNumber,localLineNormals, &
+    & err,error,*)
+
+    !Argument variables
+    TYPE(DataProjectionType), POINTER :: dataProjection !<A pointer to the data projection for which projection result is stored
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The data projection user number to set the element line number distance for
+    INTEGER(INTG), INTENT(IN) :: elementUserNumber !<The projection candidate user element number to set the result
+    INTEGER(INTG), INTENT(IN) :: localLineNormals(:) !<The projection candidate element line normals to set the result for
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code
+    TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
+    !Local Variables
+    INTEGER(INTG) :: dataPointGlobalNumber,elementLocalNumber,localLineNumber
+    LOGICAL :: elementExists,ghostElement
+    TYPE(BASIS_TYPE), POINTER :: basis
+    TYPE(DECOMPOSITION_TYPE), POINTER :: decomposition
+    TYPE(DECOMPOSITION_TOPOLOGY_TYPE), POINTER :: decompositionTopology
+    TYPE(DOMAIN_TYPE), POINTER :: domain
+    TYPE(DOMAIN_ELEMENTS_TYPE), POINTER :: domainElements
+    TYPE(DOMAIN_TOPOLOGY_TYPE), POINTER :: domainTopology
+    TYPE(VARYING_STRING) :: localError
+     
+    ENTERS("DataProjection_ResultElementLineNumberSet",err,error,*999)
+
+    IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
+    IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
+    IF(dataProjection%dataProjectionProjected) CALL FlagError("Data projection has already been projected.",err,error,*999)
+    IF(SIZE(localLineNormals,1)/=2) THEN
+      localError="The size of the line normals array of "// &
+        & TRIM(NumberToVString(SIZE(localLineNormals,1),"*",err,error))//" is invalid. The size should be 2."
+      CALL FlagError(localError,err,error,*999)
+    ENDIF
+
+    SELECT CASE(dataProjection%projectionType)
+    CASE(DATA_PROJECTION_BOUNDARY_FACES_PROJECTION_TYPE)
+      CALL FlagError("Use the result element faces routine not the element lines routine for a boundary lines projection.", &
+        & err,error,*999)
+    CASE(DATA_PROJECTION_ALL_ELEMENTS_PROJECTION_TYPE)
+      CALL FlagError("Use the result elements routine not the element lines routine for an all elements projection.", &
+        & err,error,*999)
+    CASE(DATA_PROJECTION_BOUNDARY_LINES_PROJECTION_TYPE)
+      NULLIFY(decomposition)
+      CALL DataProjection_DecompositionGet(dataProjection,decomposition,err,error,*999)
+      NULLIFY(decompositionTopology)
+      CALL Decomposition_TopologyGet(decomposition,decompositionTopology,err,error,*999)
+      NULLIFY(domain)
+      CALL Decomposition_DomainGet(decomposition,0,domain,err,error,*999)
+      NULLIFY(domainTopology)
+      CALL Domain_TopologyGet(domain,domainTopology,err,error,*999)
+      NULLIFY(domainElements)
+      CALL DomainTopology_ElementsGet(domainTopology,domainElements,err,error,*999)
+      CALL DataProjection_DataPointGlobalNumberGet(dataProjection,dataPointUserNumber,dataPointGlobalNumber,err,error,*999)
+      CALL DecompositionTopology_ElementCheckExists(decompositionTopology,elementUserNumber,elementExists, &
+        & elementLocalNumber,ghostElement,err,error,*999)       
+      IF(elementExists) THEN
+        IF(.NOT.ghostElement) THEN
+          NULLIFY(basis)
+          CALL DomainElements_BasisGet(domainElements,elementLocalNumber,basis,err,error,*999)
+          CALL Basis_LocalLineNumberGet(basis,localLineNormals,localLineNumber,err,error,*999)
+          dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementLocalNumber=elementLocalNumber
+          dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementLineFaceNumber=localLineNumber
+          dataProjection%dataProjectionResults(dataPointGlobalNumber)%exitTag=DATA_PROJECTION_USER_SPECIFIED
+        ENDIF
+      ELSE
+        localError="Element user number "//TRIM(NumberToVString(elementUserNumber,"*",err,error))// &
+          & " does not exist."
+        CALL FlagError(localError,err,error,*999)
+      ENDIF
+    CASE DEFAULT
+      localError="The data projection type of "//TRIM(NumberToVString(dataProjection%projectionType,"",err,error))// &
+        & " is invalid."
+      CALL FlagError(localError,err,error,*999)
+    END SELECT
+
+    EXITS("DataProjection_ResultElementLineNumberSet")
+    RETURN
+999 ERRORSEXITS("DataProjection_ResultElementLineNumberSet",err,error)    
+    RETURN 1
+
+  END SUBROUTINE DataProjection_ResultElementLineNumberSet
+
+  !
+  !================================================================================================================================
+  !
+
+  !>Gets the element xi for a data point identified by a given global number.
+  SUBROUTINE DataProjection_ResultElementXiGet(dataProjection,dataPointUserNumber,elementXi,err,error,*)
+
+    !Argument variables
+    TYPE(DataProjectionType), POINTER :: dataProjection !<A pointer to the data projection for which projection result is stored
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The data projection user number to get the element xi for
+    REAL(DP), INTENT(OUT) :: elementXi(:) !<On exit, the element xi of the specified global data point
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code
+    TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
+    !Local Variables
+    INTEGER(INTG) :: dataPointGlobalNumber,numberOfElementXi
+    TYPE(VARYING_STRING) :: localError
+    
+    ENTERS("DataProjection_ResultElementXiGet",err,error,*999)
+
+    IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
+    IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
+    IF(.NOT.dataProjection%dataProjectionProjected) CALL FlagError("Data projection has not been projected.",err,error,*999)
+        
+    CALL DataProjection_DataPointGlobalNumberGet(dataProjection,dataPointUserNumber,dataPointGlobalNumber,err,error,*999)
+    numberOfElementXi=SIZE(dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementXi,1)
+    IF(SIZE(elementXi,1)<numberOfElementXi) THEN
+      localError="The specified element xi has size of "//TRIM(NumberToVString(SIZE(elementXi,1),"*",err,error))// &
+        & " but it needs to have size of >= "//TRIM(NumberToVString(numberOfElementXi,"*",err,error))//"." 
+      CALL FlagError(localError,err,error,*999)
+    ENDIF
+    elementXi(1:numberOfElementXi)=dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementXi(1:numberOfElementXi)
+
+    EXITS("DataProjection_ResultElementXiGet")
+    RETURN
+999 ERRORSEXITS("DataProjection_ResultElementXiGet",err,error)    
+    RETURN 1
+
+  END SUBROUTINE DataProjection_ResultElementXiGet
+
+  !
+  !================================================================================================================================
+  !
+
   !>Gets the projection exit tag for a data point identified by a given global number.
   SUBROUTINE DataProjection_ResultExitTagGet(dataProjection,dataPointUserNumber,projectionExitTag,err,error,*)
 
@@ -5011,7 +5476,7 @@ END SUBROUTINE DataProjection_ResultExitTagGet
   !
 
   !>Gets the projection xi for a data point identified by a given global number.
-  SUBROUTINE DataProjection_ResultXiGet(dataProjection,dataPointUserNumber,projectionXi,err,error,*)
+  SUBROUTINE DataProjection_ResultProjectionXiGet(dataProjection,dataPointUserNumber,projectionXi,err,error,*)
 
     !Argument variables
     TYPE(DataProjectionType), POINTER :: dataProjection !<A pointer to the data projection for which projection result is stored
@@ -5023,7 +5488,7 @@ SUBROUTINE DataProjection_ResultXiGet(dataProjection,dataPointUserNumber,project
     INTEGER(INTG) :: dataPointGlobalNumber
     TYPE(VARYING_STRING) :: localError
     
-    ENTERS("DataProjection_ResultXiGet",err,error,*999)
+    ENTERS("DataProjection_ResultProjectionXiGet",err,error,*999)
 
     IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
     IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
@@ -5038,19 +5503,19 @@ SUBROUTINE DataProjection_ResultXiGet(dataProjection,dataPointUserNumber,project
     projectionXi(1:dataProjection%numberOfXi)=dataProjection%dataProjectionResults(dataPointGlobalNumber)% &
       & xi(1:dataProjection%numberOfXi)
 
-    EXITS("DataProjection_ResultXiGet")
+    EXITS("DataProjection_ResultProjectionXiGet")
     RETURN
-999 ERRORSEXITS("DataProjection_ResultXiGet",err,error)    
+999 ERRORSEXITS("DataProjection_ResultProjectionXiGet",err,error)    
     RETURN 1
 
-  END SUBROUTINE DataProjection_ResultXiGet
+  END SUBROUTINE DataProjection_ResultProjectionXiGet
 
   !
   !================================================================================================================================
   !
 
   !>Sets the projection xi for a data point identified by a given global number.
-  SUBROUTINE DataProjection_ResultXiSet(dataProjection,dataPointUserNumber,projectionXi,err,error,*)
+  SUBROUTINE DataProjection_ResultProjectionXiSet(dataProjection,dataPointUserNumber,projectionXi,err,error,*)
 
     !Argument variables
     TYPE(DataProjectionType), POINTER :: dataProjection !<A pointer to the data projection for which projection result is stored
@@ -5059,14 +5524,20 @@ SUBROUTINE DataProjection_ResultXiSet(dataProjection,dataPointUserNumber,project
     INTEGER(INTG), INTENT(OUT) :: err !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
     !Local Variables
-    INTEGER(INTG) :: dataPointGlobalNumber
+    INTEGER(INTG) :: dataPointGlobalNumber, elementNumber, localLineFaceNumber
+    TYPE(DECOMPOSITION_TYPE), POINTER :: decomposition
+    TYPE(DECOMPOSITION_TOPOLOGY_TYPE), POINTER :: decompositionTopology
+    TYPE(DOMAIN_TYPE), POINTER :: domain
+    TYPE(DOMAIN_TOPOLOGY_TYPE), POINTER :: domainTopology
+    TYPE(DOMAIN_ELEMENTS_TYPE), POINTER :: domainElements
+    TYPE(BASIS_TYPE), POINTER :: basis
     TYPE(VARYING_STRING) :: localError
     
-    ENTERS("DataProjection_ResultXiSet",err,error,*999)
+    ENTERS("DataProjection_ResultProjectionXiSet",err,error,*999)
 
     IF(.NOT.ASSOCIATED(dataProjection)) CALL FlagError("Data projection is not associated.",err,error,*999)
     IF(.NOT.dataProjection%dataProjectionFinished) CALL FlagError("Data projection has not been finished.",err,error,*999)
-    IF(.NOT.dataProjection%dataProjectionProjected) CALL FlagError("Data projection has not been projected.",err,error,*999)
+    !IF(dataProjection%dataProjectionProjected) CALL FlagError("Data projection has already been projected.",err,error,*999)
     IF(SIZE(projectionXi,1)/=dataProjection%numberOfXi) THEN
       localError="The specified projection xi has size of "//TRIM(NumberToVString(SIZE(projectionXi,1),"*",err,error))// &
         & "but it needs to have size of "//TRIM(NumberToVString(dataProjection%numberOfXi,"*",err,error))//"."
@@ -5079,12 +5550,35 @@ SUBROUTINE DataProjection_ResultXiSet(dataProjection,dataPointUserNumber,project
     dataProjection%dataProjectionResults(dataPointGlobalNumber)%xi(1:dataProjection%numberOfXi)= &
       & projectionXi(1:dataProjection%numberOfXi)
 
-    EXITS("DataProjection_ResultXiSet")
+    !Compute full elemental xi
+    decomposition=>dataProjection%decomposition
+    NULLIFY(decompositionTopology)
+    CALL Decomposition_TopologyGet(decomposition,decompositionTopology,err,error,*999)
+    NULLIFY(domain)
+    CALL Decomposition_DomainGet(decomposition,0,domain,err,error,*999)
+    NULLIFY(domainTopology)
+    CALL Domain_TopologyGet(domain,domainTopology,err,error,*999)
+    NULLIFY(domainElements)
+    CALL DomainTopology_ElementsGet(domainTopology,domainElements,err,error,*999)
+
+    IF(dataProjection%numberOfXi==dataProjection%numberOfElementXi) THEN
+      dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementXi= &
+        & dataProjection%dataProjectionResults(dataPointGlobalNumber)%xi
+    ELSE
+      elementNumber=dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementLocalNumber
+      localLineFaceNumber=dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementLineFaceNumber
+      basis=>domainElements%elements(elementNumber)%basis
+      CALL Basis_BoundaryXiToXi(basis,localLineFaceNumber,dataProjection% &
+        & dataProjectionResults(dataPointGlobalNumber)%xi(1:dataProjection%numberOfXi),dataProjection% &
+        & dataProjectionResults(dataPointGlobalNumber)%elementXi,err,error,*999)
+    ENDIF
+
+    EXITS("DataProjection_ResultProjectionXiSet")
     RETURN
-999 ERRORSEXITS("DataProjection_ResultXiSet",err,error)
+999 ERRORSEXITS("DataProjection_ResultProjectionXiSet",err,error)
     RETURN 1
 
-  END SUBROUTINE DataProjection_ResultXiSet
+  END SUBROUTINE DataProjection_ResultProjectionXiSet
 
   !
   !================================================================================================================================
diff --git a/src/equations_set_constants.F90 b/src/equations_set_constants.F90
index 53a9bbac..e009e78c 100644
--- a/src/equations_set_constants.F90
+++ b/src/equations_set_constants.F90
@@ -154,6 +154,8 @@ MODULE EquationsSetConstants
   INTEGER(INTG), PARAMETER :: EQUATIONS_SET_ANISOTROPIC_POLYNOMIAL_ACTIVE_SUBTYPE=30
   INTEGER(INTG), PARAMETER :: EQUATIONS_SET_HOLZAPFEL_OGDEN_ACTIVECONTRACTION_SUBTYPE=31
   INTEGER(INTG), PARAMETER :: EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE=32
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE=44
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE=45
   INTEGER(INTG), PARAMETER :: EQUATIONS_SET_CONSTITUTIVE_AND_GROWTH_LAW_IN_CELLML_SUBTYPE=33
   INTEGER(INTG), PARAMETER :: EQUATIONS_SET_GROWTH_LAW_IN_CELLML_SUBTYPE=34
   INTEGER(INTG), PARAMETER :: EQUATIONS_SET_ACTIVE_STRAIN_SUBTYPE=35
@@ -406,14 +408,17 @@ MODULE EquationsSetConstants
   !> \see EquationsSetConstants
   !>@{
   INTEGER(INTG), PARAMETER :: EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR=1 !<Deformation gradient tensor \see EquationsSetConstants_TensorTypes,EquationsSetConstants
-  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_R_CAUCHY_GREEN_DEFORMATION_TENSOR=2 !<Right Cauchy-Green deformation field \see EquationsSetConstants_TensorTypes,EquationsSetConstants
-  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_L_CAUCHY_GREEN_DEFORMATION_TENSOR=3 !<Right Cauchy-Green deformation field \see EquationsSetConstants_TensorTypes,EquationsSetConstants
-  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_GREEN_LAGRANGE_STRAIN_TENSOR=4 !<Green-Lagrange strain tensor \see EquationsSetConstants_TensorTypes,EquationsSetConstants
-  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_CAUCHY_STRESS_TENSOR=5 !<Cauchy stress tensor \see EquationsSetConstants_TensorTypes,EquationsSetConstants
-  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_FIRST_PK_STRESS_TENSOR=6 !<First Piola Kirchhoff stress tensor \see EquationsSetConstants_TensorEvaluateTypes,EquationsSetConstants
-  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_SECOND_PK_STRESS_TENSOR=7 !<Second Piola Kirchhoff stress tensor \see EquationsSetConstants_TensorEvaluateTypes,EquationsSetConstants
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_SPATIAL=2 !<Deformation gradient tensor \see EquationsSetConstants_TensorTypes,EquationsSetConstants
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_FIBRE=3 !<Deformation gradient tensor \see EquationsSetConstants_TensorTypes,EquationsSetConstants
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_R_CAUCHY_GREEN_DEFORMATION_TENSOR=4 !<Right Cauchy-Green deformation field \see EquationsSetConstants_TensorTypes,EquationsSetConstants
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_L_CAUCHY_GREEN_DEFORMATION_TENSOR=5 !<Right Cauchy-Green deformation field \see EquationsSetConstants_TensorTypes,EquationsSetConstants
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_GREEN_LAGRANGE_STRAIN_TENSOR=6 !<Green-Lagrange strain tensor \see EquationsSetConstants_TensorTypes,EquationsSetConstants
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_CAUCHY_STRESS_TENSOR=7 !<Cauchy stress tensor \see EquationsSetConstants_TensorTypes,EquationsSetConstants
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_CAUCHY_STRESS_TENSOR_FIBRE=8 !<Cauchy stress tensor wrt deformed fibres \see EquationsSetConstants_TensorTypes,EquationsSetConstants
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_FIRST_PK_STRESS_TENSOR=9 !<First Piola Kirchhoff stress tensor \see EquationsSetConstants_TensorEvaluateTypes,EquationsSetConstants
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_SECOND_PK_STRESS_TENSOR=10 !<Second Piola Kirchhoff stress tensor \see EquationsSetConstants_TensorEvaluateTypes,EquationsSetConstants
   !>@}
-  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_NUMBER_OF_TENSOR_TYPES=7
+  INTEGER(INTG), PARAMETER :: EQUATIONS_SET_NUMBER_OF_TENSOR_TYPES=10
 
   !> \addtogroup EquationsSetConstants_DynamicMatrixTypes EquationsSetConstants::DynamicMatrixTypes
   !> \brief Type of matrix in a dynamic equations set
diff --git a/src/equations_set_routines.F90 b/src/equations_set_routines.F90
index 10437fa8..442b7882 100644
--- a/src/equations_set_routines.F90
+++ b/src/equations_set_routines.F90
@@ -2772,6 +2772,8 @@ SUBROUTINE EquationsSet_FiniteElementJacobianEvaluate(equationsSet,elementNumber
           CALL FlagError("Not implemented.",err,error,*999)
         CASE(EQUATIONS_SET_CLASSICAL_FIELD_CLASS)
           CALL ClassicalField_FiniteElementJacobianEvaluate(equationsSet,elementNumber,err,error,*999)
+        CASE(EQUATIONS_SET_FITTING_CLASS)
+          CALL FlagError("Not implemented.",err,error,*999)
         CASE(EQUATIONS_SET_BIOELECTRICS_CLASS)
           CALL FlagError("Not implemented.",err,error,*999)
         CASE(EQUATIONS_SET_MODAL_CLASS)
@@ -2907,6 +2909,10 @@ SUBROUTINE EquationsSet_FiniteElementJacobianEvaluateFD(equationsSet,elementNumb
       ! so let's just loop over component, node/el, derivative
       column=0  ! element jacobian matrix column number
       DO componentIdx=1,columnVariable%NUMBER_OF_COMPONENTS
+        ! adjusts the pertubation for the hydrostatic pressure to not use the L2Norm
+        IF(componentIdx==4) THEN
+          delta=(1.0_DP)*nonlinearMatrices%jacobians(jacobianNumber)%ptr%jacobianFiniteDifferenceStepSize
+        ENDIF
         elementsTopology=>columnVariable%COMPONENTS(componentIdx)%DOMAIN%TOPOLOGY%ELEMENTS
         componentInterpolationType=columnVariable%COMPONENTS(componentIdx)%INTERPOLATION_TYPE
         SELECT CASE(componentInterpolationType)
@@ -3012,6 +3018,8 @@ SUBROUTINE EquationsSet_FiniteElementResidualEvaluate(equationsSet,elementNumber
       CALL FlagError("Not implemented.",err,error,*999)
     CASE(EQUATIONS_SET_CLASSICAL_FIELD_CLASS)
       CALL ClassicalField_FiniteElementResidualEvaluate(equationsSet,elementNumber,err,error,*999)
+    CASE(EQUATIONS_SET_FITTING_CLASS)
+      CALL FlagError("Not implemented.",err,error,*999)
     CASE(EQUATIONS_SET_BIOELECTRICS_CLASS)
       CALL FlagError("Not implemented.",err,error,*999)
     CASE(EQUATIONS_SET_MODAL_CLASS)
diff --git a/src/field_routines.F90 b/src/field_routines.F90
index d275080a..814629b0 100644
--- a/src/field_routines.F90
+++ b/src/field_routines.F90
@@ -1290,6 +1290,8 @@ MODULE FIELD_ROUTINES
   
   PUBLIC FieldVariable_ParameterSetGet
 
+  PUBLIC Fields_AddField
+
   PUBLIC Fields_Finalise,Fields_Initialise
 
   PUBLIC MESH_EMBEDDING_PUSH_DATA, MESH_EMBEDDING_PULL_GAUSS_POINT_DATA, FIELD_PARAMETER_SET_GET_GAUSS_POINT_COORD
@@ -32067,6 +32069,79 @@ END SUBROUTINE FieldVariable_ParameterSetsCopyIfExists
   !================================================================================================================================
   !
 
+  !>Adds a field to a fields list
+  SUBROUTINE Fields_AddField(fields,field,err,error,*)
+
+    !Argument variables
+    TYPE(FIELDS_TYPE), POINTER :: fields !<A pointer to the fields to add a field to
+    TYPE(FIELD_TYPE), POINTER :: field !<The field to add
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code
+    TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
+    !Local Variables
+    INTEGER(INTG) :: fieldIdx
+    TYPE(FIELD_PTR_TYPE), POINTER :: newFields(:)
+
+    ENTERS("Fields_AddField",err,error,*999)
+    
+    IF(.NOT.ASSOCIATED(field)) CALL FlagError("Field is not associated.",err,error,*999)
+    IF(.NOT.ASSOCIATED(fields)) THEN
+      ALLOCATE(fields,STAT=err)
+      IF(err/=0) CALL FlagError("Could not allocate fields.",err,error,*999)
+      CALL FIELDS_INITIALISE_GENERIC(fields,err,error,*999)      
+    ENDIF
+    NULLIFY(newFields)
+    ALLOCATE(newFields(fields%NUMBER_OF_FIELDS+1),STAT=err)
+    IF(err/=0) CALL FlagError("Could not allocate new fields.",err,error,*999)
+    IF(fields%NUMBER_OF_FIELDS>0) THEN
+      IF(ASSOCIATED(fields%region)) THEN
+        IF(ASSOCIATED(field%region)) THEN
+          IF(.NOT.ASSOCIATED(fields%region,field%region)) &
+            & CALL FlagError("The specified field does not have the same region as the specified fields.",err,error,*999)
+        ELSE IF(ASSOCIATED(field%INTERFACE)) THEN
+          CALL FlagError("Can not add a field from an interface to fields that are from a region.",err,error,*999)
+        ELSE
+          CALL FlagError("Field does not have an associated region or interface.",err,error,*999)
+        ENDIF
+      ELSE IF(ASSOCIATED(fields%INTERFACE)) THEN
+       IF(ASSOCIATED(field%interface)) THEN
+          IF(.NOT.ASSOCIATED(fields%interface,field%interface)) &
+            & CALL FlagError("The specified field does not have the same interface as the specified fields.",err,error,*999)
+        ELSE IF(ASSOCIATED(field%region)) THEN
+          CALL FlagError("Can not add a field from a region to fields that are from an interface.",err,error,*999)
+        ELSE
+          CALL FlagError("Field does not have an associated region or interface.",err,error,*999)
+        ENDIF
+      ELSE
+        CALL FlagError("Fields does not have a region or interface.",err,error,*999)
+      ENDIF
+    ELSE
+      IF(ASSOCIATED(field%region)) THEN
+        fields%region=>field%region
+      ELSE IF(ASSOCIATED(field%INTERFACE)) THEN
+        fields%interface=>field%interface
+      ELSE
+          CALL FlagError("Field does not have an associated region or interface.",err,error,*999)
+      ENDIF
+    ENDIF
+    DO fieldIdx=1,fields%NUMBER_OF_FIELDS
+      newFields(fieldIdx)%ptr=>fields%fields(fieldIdx)%ptr
+    ENDDO !fieldIdx
+    newFields(fields%NUMBER_OF_FIELDS+1)%ptr=>field
+    IF(ASSOCIATED(fields%fields)) DEALLOCATE(fields%fields)
+    fields%fields=>newFields
+    fields%NUMBER_OF_FIELDS=fields%NUMBER_OF_FIELDS+1
+    
+    EXITS("Fields_AddField")
+    RETURN
+999 ERRORSEXITS("Fields_AddField",err,error)
+    RETURN 1
+    
+  END SUBROUTINE Fields_AddField
+
+  !
+  !================================================================================================================================
+  !
+
   !>Finalises the fields and deallocates all memory.
   SUBROUTINE FIELDS_FINALISE(FIELDS,ERR,ERROR,*)
 
diff --git a/src/finite_elasticity_routines.F90 b/src/finite_elasticity_routines.F90
index c5b8c450..d3e48a97 100644
--- a/src/finite_elasticity_routines.F90
+++ b/src/finite_elasticity_routines.F90
@@ -732,7 +732,7 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_ELASTICITY_TENSOR(EQUATIONS_SET,DEPENDENT_INT
 
     SELECT CASE(EQUATIONS_SET%specification(3))
     CASE(EQUATIONS_SET_MOONEY_RIVLIN_ACTIVECONTRACTION_SUBTYPE, &
-      & EQUATIONS_SET_MOONEY_RIVLIN_SUBTYPE, &
+      & EQUATIONS_SET_MOONEY_RIVLIN_SUBTYPE, EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE, &
       & EQUATIONS_SET_MR_AND_GROWTH_LAW_IN_CELLML_SUBTYPE)
       LOCAL_ERROR="Analytic Jacobian has not been validated for the Mooney-Rivlin equations, please use finite differences instead."
       CALL FlagWarning(LOCAL_ERROR,ERR,ERROR,*999)
@@ -794,6 +794,7 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_ELASTICITY_TENSOR(EQUATIONS_SET,DEPENDENT_INT
       STRESS_TENSOR(1:3)=STRESS_TENSOR(1:3)+P
 
     CASE(EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE,EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
+      & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
       & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE)
       PRESSURE_COMPONENT=DEPENDENT_INTERPOLATED_POINT%INTERPOLATION_PARAMETERS%FIELD_VARIABLE%NUMBER_OF_COMPONENTS
       P=DEPENDENT_INTERPOLATED_POINT%VALUES(PRESSURE_COMPONENT,NO_PART_DERIV)
@@ -803,30 +804,7 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_ELASTICITY_TENSOR(EQUATIONS_SET,DEPENDENT_INT
       TEMPTERM1=0.5_DP*C(1)*EXP(0.5_DP*DOT_PRODUCT(E,DQ_DE))
       !Calculate 2nd Piola tensor (in Voigt form)
       STRESS_TENSOR=TEMPTERM1*DQ_DE + P*AZUv
-      !lambda = 1.0_DP
-      !lambda(1) = SQRT(AZL(1,1))
-      IF(EQUATIONS_SET%specification(3)==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE) THEN
-        !add active contraction stress values
-        CALL Field_VariableGet(EQUATIONS_SET%INDEPENDENT%INDEPENDENT_FIELD,FIELD_U_VARIABLE_TYPE,FIELD_VARIABLE,ERR,ERROR,*999)
-        DO component_idx=1,FIELD_VARIABLE%NUMBER_OF_COMPONENTS
-          SELECT CASE(FIELD_VARIABLE%COMPONENTS(component_idx)%INTERPOLATION_TYPE)
-          CASE(FIELD_CONSTANT_INTERPOLATION)
-            VALUE=0.1_DP
-          CASE(FIELD_GAUSS_POINT_BASED_INTERPOLATION)
-            dof_idx=FIELD_VARIABLE%COMPONENTS(component_idx)%PARAM_TO_DOF_MAP%GAUSS_POINT_PARAM2DOF_MAP% &
-              & GAUSS_POINTS(GAUSS_POINT_NUMBER,ELEMENT_NUMBER)
-            CALL FIELD_PARAMETER_SET_GET_LOCAL_DOF(EQUATIONS_SET%INDEPENDENT%INDEPENDENT_FIELD,FIELD_U_VARIABLE_TYPE, &
-              & FIELD_VALUES_SET_TYPE,dof_idx,VALUE,err,error,*999)
-          CASE(FIELD_ELEMENT_BASED_INTERPOLATION)
-            VALUE=INDEPENDENT_INTERPOLATED_POINT%VALUES(component_idx,NO_PART_DERIV)
-          CASE DEFAULT
-            LOCAL_ERROR="This independent field variable interpolation type is not supported."
-            CALL FlagError(LOCAL_ERROR,err,error,*999)
-          END SELECT
-          STRESS_TENSOR(component_idx)=STRESS_TENSOR(component_idx)+VALUE
-          !STRESS_TENSOR(component_idx)=STRESS_TENSOR(component_idx)+VALUE*(1.0_DP+1.45_DP*(lambda(component_idx)-1.0_DP))
-        ENDDO
-      ENDIF
+
 
       !\todo blas has routines specifically for symmetric matrices, so it would be worth to check if these could give some speedup.
 
@@ -929,7 +907,8 @@ SUBROUTINE FiniteElasticity_FiniteElementJacobianEvaluate(EQUATIONS_SET,ELEMENT_
         nonlinearMatrices=>vectorMatrices%nonlinearMatrices
         jacobianMatrix=>nonlinearMatrices%jacobians(1)%ptr
         IF(jacobianMatrix%updateJacobian) THEN
-          IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+          IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+            & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
             DEPENDENT_FIELD=>equations%interpolation%geometricField
             GEOMETRIC_FIELD=>equations%interpolation%dependentField
           ELSE
@@ -980,7 +959,8 @@ SUBROUTINE FiniteElasticity_FiniteElementJacobianEvaluate(EQUATIONS_SET,ELEMENT_
           !Point interpolation pointer
           geometricInterpPoint=>equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr
           geometricInterpPointMetrics=>equations%interpolation%geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr
-          IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+          IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+            & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
             dependentInterpPoint=>equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr
             dependentInterpPointMetrics=>equations%interpolation%geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr
             geometricInterpPoint=>equations%interpolation%dependentInterpPoint(FIELD_VAR_TYPE)%ptr
@@ -1431,8 +1411,9 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
     INTEGER(INTG) :: var2 ! Variable number corresponding to 'DELUDLEN' in single physics case
     INTEGER(INTG), POINTER :: EQUATIONS_SET_FIELD_DATA(:)
     REAL(DP) :: DZDNU(3,3),DZDNUT(3,3),dzdx(3,3),AZL(3,3),AZU(3,3),Fe(3,3),FeT(3,3),Fg(3,3),C(3,3),f(3,3),E(3,3),I3,P, &
-      & piolaTensor(3,3),TEMP(3,3),prevdzdx(3,3),prevdZdNu(3,3),invPrevdZdNu(3,3)
-    REAL(DP) :: cauchyTensor(3,3),JGW_CAUCHY_TENSOR(3,3),kirchoffTensor(3,3),STRESS_TENSOR(6),growthValues(3)
+      & piolaTensor(3,3),TEMP(3,3),prevdzdx(3,3),prevdZdNu(3,3),invPrevdZdNu(3,3), DNUODNU(3,3)
+    REAL(DP) :: cauchyTensor(3,3),JGW_CAUCHY_TENSOR(3,3),kirchoffTensor(3,3),STRESS_TENSOR(6),growthValues(3), &
+      & cauchyTensorFbr(3,3)
     REAL(DP) :: deformationGradientTensor(3,3),growthTensor(3,3),growthTensorInverse(3,3),growthTensorInverseTranspose(3,3), &
       & fibreGrowth,sheetGrowth,normalGrowth,fibreVector(3),sheetVector(3),normalVector(3)
     REAL(DP) :: dNudXi(3,3),dXidNu(3,3)
@@ -1513,7 +1494,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
         rhsVector=>vectorMatrices%rhsVector
         vectorMapping =>vectorEquations%vectorMapping
 
-        IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+        IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+          & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
           DEPENDENT_FIELD  =>equations%interpolation%geometricField
           GEOMETRIC_FIELD  =>equations%interpolation%dependentField
         ELSE
@@ -1570,7 +1552,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
         !Grab interpolation parameters
         FIELD_VARIABLE=>EQUATIONS_SET%equations%vectorEquations%vectorMapping%nonlinearMapping%residualVariables(1)%ptr
         FIELD_VAR_TYPE=FIELD_VARIABLE%VARIABLE_TYPE
-        IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+        IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+          & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
           GEOMETRIC_INTERPOLATION_PARAMETERS=>equations%interpolation%dependentInterpParameters(FIELD_VAR_TYPE)%ptr
           DEPENDENT_INTERPOLATION_PARAMETERS=>equations%interpolation%geometricInterpParameters(FIELD_U_VARIABLE_TYPE)%ptr
         ELSE
@@ -1590,7 +1573,9 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
         IF(DARCY_DEPENDENT) THEN
           DARCY_DEPENDENT_INTERPOLATION_PARAMETERS=>equations%interpolation%dependentInterpParameters(FIELD_V_VARIABLE_TYPE)%ptr
         ELSE IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE .OR. &
-          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE) THEN
+          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE .OR. &
+          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE .OR. &
+          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE) THEN
           INDEPENDENT_INTERPOLATION_PARAMETERS=>equations%interpolation%independentInterpParameters(FIELD_U_VARIABLE_TYPE)%ptr
         ENDIF
 !       IF(ASSOCIATED(SOURCE_FIELD)) THEN
@@ -1621,7 +1606,9 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
           CALL FIELD_INTERPOLATION_PARAMETERS_ELEMENT_GET(FIELD_VALUES_SET_TYPE,elementNumber, &
             & DARCY_DEPENDENT_INTERPOLATION_PARAMETERS,err,error,*999)
         ELSE IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE .OR. &
-          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE) THEN
+          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE .OR. &
+          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE .OR. &
+          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE) THEN
           CALL FIELD_INTERPOLATION_PARAMETERS_ELEMENT_GET(FIELD_VALUES_SET_TYPE,elementNumber, &
             & INDEPENDENT_INTERPOLATION_PARAMETERS,err,error,*999)
         ENDIF
@@ -1631,7 +1618,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
 !       END IF
 
         !Point interpolation pointer
-        IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+        IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+          & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
           DEPENDENT_INTERPOLATED_POINT=>equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr
           DEPENDENT_INTERPOLATED_POINT_METRICS=>equations%interpolation%geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr
           GEOMETRIC_INTERPOLATED_POINT=>equations%interpolation%dependentInterpPoint(FIELD_VAR_TYPE)%ptr
@@ -1656,7 +1644,9 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
         IF(DARCY_DEPENDENT) THEN
           DARCY_DEPENDENT_INTERPOLATED_POINT=>equations%interpolation%dependentInterpPoint(FIELD_V_VARIABLE_TYPE)%ptr
         ELSE IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE .OR. &
-          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE) THEN
+          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE .OR. &
+          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE .OR. &
+          & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE) THEN
           INDEPENDENT_INTERPOLATED_POINT=>equations%interpolation%independentInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr
         ENDIF
         IF(ASSOCIATED(SOURCE_FIELD)) THEN
@@ -1667,7 +1657,7 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
         SELECT CASE(EQUATIONS_SET_SUBTYPE)
         ! ---------------------------------------------------------------
         CASE(EQUATIONS_SET_MOONEY_RIVLIN_ACTIVECONTRACTION_SUBTYPE, &
-          & EQUATIONS_SET_MOONEY_RIVLIN_SUBTYPE)
+          & EQUATIONS_SET_MOONEY_RIVLIN_SUBTYPE, EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE)
           !Loop over gauss points and add residuals
           DO gauss_idx=1,DEPENDENT_NUMBER_OF_GAUSS_POINTS
             !Interpolate dependent, geometric, fibre and materials fields
@@ -1826,6 +1816,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
           & EQUATIONS_SET_ISOTROPIC_EXPONENTIAL_SUBTYPE, &
           & EQUATIONS_SET_TRANSVERSE_ISOTROPIC_EXPONENTIAL_SUBTYPE, &
           & EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE,EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
+          & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+          & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
           & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
           & EQUATIONS_SET_ORTHOTROPIC_MATERIAL_COSTA_SUBTYPE, EQUATIONS_SET_ACTIVECONTRACTION_SUBTYPE, &
           & EQUATIONS_SET_INCOMPRESSIBLE_FINITE_ELASTICITY_DARCY_SUBTYPE,EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE, &
@@ -1863,7 +1855,9 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
               CALL FIELD_INTERPOLATE_GAUSS(NO_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,gauss_idx, &
                 & DARCY_DEPENDENT_INTERPOLATED_POINT,err,error,*999)
             ELSE IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE .OR. &
-              & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE) THEN
+              & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE .OR. &
+              & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE .OR. &
+              & EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE) THEN
               CALL FIELD_INTERPOLATE_GAUSS(NO_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,gauss_idx, &
                 & INDEPENDENT_INTERPOLATED_POINT,err,error,*999)
             ENDIF
@@ -1897,7 +1891,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
             !Calculate Sigma=1/Jznu.FTF', the Cauchy stress tensor at the gauss point
             CALL FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPOLATED_POINT, &
               & MATERIALS_INTERPOLATED_POINT,GEOMETRIC_INTERPOLATED_POINT,DARCY_DEPENDENT_INTERPOLATED_POINT, &
-              & INDEPENDENT_INTERPOLATED_POINT,cauchyTensor,Jznu,DZDNU,elementNumber,gauss_idx,err,error,*999)
+              & INDEPENDENT_INTERPOLATED_POINT,cauchyTensor,cauchyTensorFbr,Jznu,DZDNU,DZDX,DNUODNU, &
+              & elementNumber,gauss_idx,err,error,*999)
 
             IF(DIAGNOSTICS1) THEN
               CALL WriteString(DIAGNOSTIC_OUTPUT_TYPE,"",err,error,*999)
@@ -2138,7 +2133,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
             
             !Hydrostatic pressure component (skip for membrane problems)
             IF (EQUATIONS_SET_SUBTYPE /= EQUATIONS_SET_MEMBRANE_SUBTYPE) THEN
-              IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+              IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+                & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
                 HYDROSTATIC_PRESSURE_COMPONENT=GEOMETRIC_FIELD%VARIABLES(var1)%NUMBER_OF_COMPONENTS
                 DEPENDENT_COMPONENT_INTERPOLATION_TYPE=GEOMETRIC_FIELD%VARIABLES(var1)%COMPONENTS( &
                   & HYDROSTATIC_PRESSURE_COMPONENT)%INTERPOLATION_TYPE
@@ -2153,7 +2149,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
                 TEMPTERM1=GAUSS_WEIGHT*Jxxi*(Jznu-Jg)
               ENDIF            
               IF(DEPENDENT_COMPONENT_INTERPOLATION_TYPE==FIELD_NODE_BASED_INTERPOLATION) THEN !node based
-                IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+                IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+                  & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
                   COMPONENT_BASIS=>GEOMETRIC_FIELD%VARIABLES(var1)%COMPONENTS(HYDROSTATIC_PRESSURE_COMPONENT)%DOMAIN% &
                     & TOPOLOGY%ELEMENTS%ELEMENTS(elementNumber)%BASIS
                 ELSE
@@ -2524,7 +2521,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
             
             !Hydrostatic pressure component (skip for membrane problems)
             IF (EQUATIONS_SET_SUBTYPE /= EQUATIONS_SET_MEMBRANE_SUBTYPE) THEN
-              IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+              IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+                & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
                 HYDROSTATIC_PRESSURE_COMPONENT=GEOMETRIC_FIELD%VARIABLES(var1)%NUMBER_OF_COMPONENTS
                 DEPENDENT_COMPONENT_INTERPOLATION_TYPE=GEOMETRIC_FIELD%VARIABLES(var1)%COMPONENTS( &
                   & HYDROSTATIC_PRESSURE_COMPONENT)%INTERPOLATION_TYPE
@@ -2539,7 +2537,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
                 TEMPTERM1=GAUSS_WEIGHT*Jxxi*(Je-1.0_DP)
               ENDIF            
               IF(DEPENDENT_COMPONENT_INTERPOLATION_TYPE==FIELD_NODE_BASED_INTERPOLATION) THEN !node based
-                IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+                IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+                  & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
                   COMPONENT_BASIS=>GEOMETRIC_FIELD%VARIABLES(var1)%COMPONENTS(HYDROSTATIC_PRESSURE_COMPONENT)%DOMAIN% &
                     & TOPOLOGY%ELEMENTS%ELEMENTS(elementNumber)%BASIS
                 ELSE
@@ -3221,7 +3220,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
             !Calculate Sigma=1/Jznu.FTF', the Cauchy stress tensor at the gauss point
             CALL FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPOLATED_POINT, &
               & MATERIALS_INTERPOLATED_POINT,GEOMETRIC_INTERPOLATED_POINT,DARCY_DEPENDENT_INTERPOLATED_POINT, &
-              & INDEPENDENT_INTERPOLATED_POINT,cauchyTensor,Jznu,DZDNU,elementNumber,gauss_idx,err,error,*999)
+              & INDEPENDENT_INTERPOLATED_POINT,cauchyTensor,cauchyTensorFbr,Jznu,DZDNU,DZDX,DNUODNU, &
+              & elementNumber,gauss_idx,err,error,*999)
 
             !Calculate dPhi/dZ at the gauss point, Phi is the basis function
             CALL FINITE_ELASTICITY_GAUSS_DFDZ(DEPENDENT_INTERPOLATED_POINT,elementNumber,gauss_idx,numberOfDimensions, &
@@ -3332,7 +3332,8 @@ SUBROUTINE FiniteElasticity_FiniteElementResidualEvaluate(EQUATIONS_SET,elementN
             !Calculate Cauchy stress tensor at the gauss point
             CALL FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPOLATED_POINT, &
               & MATERIALS_INTERPOLATED_POINT,GEOMETRIC_INTERPOLATED_POINT,DARCY_DEPENDENT_INTERPOLATED_POINT, &
-              & INDEPENDENT_INTERPOLATED_POINT,cauchyTensor,Jznu,DZDNU,elementNumber,gauss_idx,err,error,*999)
+              & INDEPENDENT_INTERPOLATED_POINT,cauchyTensor,cauchyTensorFbr,Jznu,DZDNU,DZDX,DNUODNU, &
+              & elementNumber,gauss_idx,err,error,*999)
 
             !Calculate dF/DZ at the gauss point
             CALL FINITE_ELASTICITY_GAUSS_DFDZ(DEPENDENT_INTERPOLATED_POINT,elementNumber,gauss_idx,numberOfDimensions, &
@@ -3554,7 +3555,10 @@ SUBROUTINE FiniteElasticity_FiniteElementPreResidualEvaluate(equationsSet,err,er
       & EQUATIONS_SET_ORTHOTROPIC_MATERIAL_HOLZAPFEL_OGDEN_SUBTYPE, &
       & EQUATIONS_SET_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE,EQUATIONS_SET_NEARLY_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE, &
       & EQUATIONS_SET_INCOMPRESSIBLE_ELAST_MULTI_COMP_DARCY_SUBTYPE,EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
-      & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
+      & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
+      & EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE, &
+      & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+      & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
       & EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
       & EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
       & EQUATIONS_SET_ELASTICITY_FLUID_PRES_HOLMES_MOW_ACTIVE_SUBTYPE, &
@@ -3622,7 +3626,10 @@ SUBROUTINE FiniteElasticity_FiniteElementPostResidualEvaluate(EQUATIONS_SET,err,
         & EQUATIONS_SET_ORTHOTROPIC_MATERIAL_HOLZAPFEL_OGDEN_SUBTYPE, &
         & EQUATIONS_SET_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE,EQUATIONS_SET_NEARLY_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE, & 
         & EQUATIONS_SET_INCOMPRESSIBLE_ELAST_MULTI_COMP_DARCY_SUBTYPE,EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
-        & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE,  EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE,&
+        & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE,&
+        & EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE, &
+        & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+        & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
         & EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_STATIC_INRIA_SUBTYPE, &
         & EQUATIONS_SET_TRANSVERSE_ISOTROPIC_HUMPHREY_YIN_SUBTYPE,&
         & EQUATIONS_SET_ELASTICITY_FLUID_PRESSURE_HOLMES_MOW_SUBTYPE, &
@@ -3700,9 +3707,9 @@ SUBROUTINE FiniteElasticity_StressStrainCalculate(equationsSet,derivedType,field
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
     !Local Variables
     INTEGER(INTG) :: componentIdx,dependentNumberOfComponents,elementIdx,elementNumber,fieldVariableType,gaussIdx, &
-      & meshComponentNumber,numberOfComponents,numberOfDimensions,numberOfGauss,numberOfTimes,numberOfXi,partIdx, &
-      & startIdx,finishIdx,fieldInterpolation,dataPointNumber,numberOfDataPoints,dataPointIdx,residualVariableType, &
-      & fieldVarType
+      & meshComponentNumber,numberOfComponents,numberOfFullComponents,numberOfSymmetricComponents,numberOfDimensions, &
+      & numberOfGauss,numberOfTimes,numberOfXi,partIdx,startIdx,finishIdx,fieldInterpolation,dataPointNumber, &
+      & numberOfDataPoints,dataPointIdx,residualVariableType,fieldVarType,elementUserNumber
     REAL(DP) :: dZdNu(3,3),Fg(3,3),Fe(3,3),J,Jg,Je,C(3,3),f(3,3),E(3,3),growthValues(3),xi(3),values(3,3)
     REAL(SP) :: elementUserElapsed,elementSystemElapsed,systemElapsed,systemTime1(1),systemTime2(1),systemTime3(1), &
       & systemTime4(1),userElapsed,userTime1(1),userTime2(1),userTime3(1),userTime4(1)
@@ -3711,6 +3718,7 @@ SUBROUTINE FiniteElasticity_StressStrainCalculate(equationsSet,derivedType,field
     TYPE(DataProjectionType), POINTER :: dataProjection
     TYPE(DecompositionDataPointsType), POINTER :: dataPoints
     TYPE(DECOMPOSITION_TYPE), POINTER :: decomposition
+    TYPE(DECOMPOSITION_ELEMENTS_TYPE), POINTER :: decompositionElements
     TYPE(DECOMPOSITION_TOPOLOGY_TYPE), POINTER :: decompositionTopology
     TYPE(DOMAIN_TYPE), POINTER :: domain
     TYPE(DOMAIN_ELEMENTS_TYPE), POINTER :: domainElements
@@ -3744,11 +3752,14 @@ SUBROUTINE FiniteElasticity_StressStrainCalculate(equationsSet,derivedType,field
     !Check the provided strain field variable has appropriate components and interpolation
     SELECT CASE(numberOfDimensions)
     CASE(3)
-      numberOfComponents=6
+      numberOfSymmetricComponents=6
+      numberOfFullComponents=9
     CASE(2)
-      numberOfComponents=3
+      numberOfSymmetricComponents=3
+      numberOfFullComponents=4
     CASE(1)
-      numberOfComponents=1
+      numberOfSymmetricComponents=1
+      numberOfFullComponents=1
     CASE DEFAULT
       CALL FlagError("The number of dimensions of "//TRIM(NumberToVString(numberOfDimensions,"*",err,error))// &
         & " is invalid.",err,error,*999)
@@ -3756,8 +3767,26 @@ SUBROUTINE FiniteElasticity_StressStrainCalculate(equationsSet,derivedType,field
     NULLIFY(field)
     CALL FieldVariable_FieldGet(fieldVariable,field,err,error,*999)
     fieldVarType=fieldVariable%VARIABLE_TYPE
-   
-    CALL Field_NumberOfComponentsCheck(field,fieldVarType,6,err,error,*999)
+
+    SELECT CASE(derivedType)
+    CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR)
+      numberOfComponents=numberOfFullComponents
+    CASE(EQUATIONS_SET_R_CAUCHY_GREEN_DEFORMATION_TENSOR)
+      numberOfComponents=numberOfSymmetricComponents
+    CASE(EQUATIONS_SET_L_CAUCHY_GREEN_DEFORMATION_TENSOR)
+      numberOfComponents=numberOfSymmetricComponents
+    CASE(EQUATIONS_SET_GREEN_LAGRANGE_STRAIN_TENSOR)
+      numberOfComponents=numberOfSymmetricComponents
+    CASE(EQUATIONS_SET_CAUCHY_STRESS_TENSOR)
+      numberOfComponents=numberOfSymmetricComponents
+    CASE(EQUATIONS_SET_SECOND_PK_STRESS_TENSOR)
+      numberOfComponents=numberOfSymmetricComponents
+    CASE DEFAULT
+      CALL FlagError("The derived evalaute type of "//TRIM(NumberToVString(derivedType,"*",err,error))//" is invalid "// &
+        & "for finite elasticity equation sets.",err,error,*999)
+    END SELECT
+      
+    CALL Field_NumberOfComponentsCheck(field,fieldVarType,numberOfComponents,err,error,*999)
     CALL Field_ComponentInterpolationGet(field,fieldVarType,1,fieldInterpolation,err,error,*999)
     !Check the interpolation type
     SELECT CASE(fieldInterpolation)
@@ -3811,6 +3840,8 @@ SUBROUTINE FiniteElasticity_StressStrainCalculate(equationsSet,derivedType,field
     CALL Field_DecompositionGet(dependentField,decomposition,err,error,*999)
     NULLIFY(decompositionTopology)
     CALL Decomposition_TopologyGet(decomposition,decompositionTopology,err,error,*999)
+    NULLIFY(decompositionElements)
+    CALL DecompositionTopology_ElementsGet(decompositionTopology,decompositionElements,err,error,*999)
     NULLIFY(domain)
     CALL Decomposition_DomainGet(decomposition,0,domain,err,error,*999)
     NULLIFY(domainMappings)
@@ -3890,6 +3921,7 @@ SUBROUTINE FiniteElasticity_StressStrainCalculate(equationsSet,derivedType,field
         
         numberOfTimes=numberOfTimes+1
         elementNumber=elementsMappings%DOMAIN_LIST(elementIdx)
+        elementUserNumber=decompositionElements%elements(elementNumber)%USER_NUMBER
         
         IF(diagnostics1) THEN
           CALL WriteStringValue(DIAGNOSTIC_OUTPUT_TYPE,"  Element number = ",elementNumber,err,error,*999)
@@ -3938,42 +3970,86 @@ SUBROUTINE FiniteElasticity_StressStrainCalculate(equationsSet,derivedType,field
             & dependentInterpolatedPointMetrics,fibreInterpolatedPoint,materialsInterpolatedPoint,independentInterpolatedPoint, &
             & growthValues,values,err,error,*999)
           
-          !We only want to store the independent components 
-          SELECT CASE(numberOfDimensions)
-          CASE(3)
-            ! 3 dimensional problem
-            ! ORDER OF THE COMPONENTS: U_11, U_12, U_13, U_22, U_23, U_33 (upper triangular matrix)
-            CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,1,values(1,1),err,error,*999)
-            CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,2,values(1,2),err,error,*999)
-            CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,3,values(1,3),err,error,*999)
-            CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,4,values(2,2),err,error,*999)
-            CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,5,values(2,3),err,error,*999)
-            CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,6,values(3,3),err,error,*999)
-          CASE(2)
-            ! 2 dimensional problem
-            ! ORDER OF THE COMPONENTS: U_11, U_12, U_22 (upper triangular matrix)
-            CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,1,values(1,1),err,error,*999)
-            CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,2,values(1,2),err,error,*999)
-            CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,3,values(2,2),err,error,*999)
-          CASE(1)
-            ! 1 dimensional problem
-            CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,1,values(1,1),err,error,*999)
-          CASE DEFAULT
-            localError="The number of dimensions of "//TRIM(NumberToVString(numberofDimensions,"*",err,error))// &
+          !We only want to store the independent components
+          IF(numberOfComponents==numberOfFullComponents) THEN
+            SELECT CASE(numberOfDimensions)
+            CASE(3)
+              ! 3 dimensional problem
+              ! ORDER OF THE COMPONENTS: U_11, U_12, U_13, U_21, U_22, U_23, U_13, U_23, U_33 (full matrix)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,1,values(1,1),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,2,values(1,2),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,3,values(1,3),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,4,values(2,1),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,5,values(2,2),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,6,values(2,3),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,7,values(3,1),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,8,values(3,2),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,9,values(3,3),err,error,*999)
+            CASE(2)
+              ! 2 dimensional problem
+              ! ORDER OF THE COMPONENTS: U_11, U_12, U_21, U_22 (full matrix)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,1,values(1,1),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,2,values(1,2),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,3,values(2,1),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,4,values(2,2),err,error,*999)
+            CASE(1)
+              ! 1 dimensional problem
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,1,values(1,1),err,error,*999)
+            CASE DEFAULT
+              localError="The number of dimensions of "//TRIM(NumberToVString(numberofDimensions,"*",err,error))// &
                 & " is invalid."
-            CALL FlagError(localError,err,error,*999)
-          END SELECT
-          
+              CALL FlagError(localError,err,error,*999)
+            END SELECT
+          ELSE
+            SELECT CASE(numberOfDimensions)
+            CASE(3)
+              ! 3 dimensional problem
+              ! ORDER OF THE COMPONENTS: U_11, U_12, U_13, U_22, U_23, U_33 (upper triangular matrix)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,1,values(1,1),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,2,values(1,2),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,3,values(1,3),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,4,values(2,2),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,5,values(2,3),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,6,values(3,3),err,error,*999)
+            CASE(2)
+              ! 2 dimensional problem
+              ! ORDER OF THE COMPONENTS: U_11, U_12, U_22 (upper triangular matrix)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,1,values(1,1),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,2,values(1,2),err,error,*999)
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,3,values(2,2),err,error,*999)
+            CASE(1)
+              ! 1 dimensional problem
+              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                & elementNumber,1,values(1,1),err,error,*999)
+            CASE DEFAULT
+              localError="The number of dimensions of "//TRIM(NumberToVString(numberofDimensions,"*",err,error))// &
+                & " is invalid."
+              CALL FlagError(localError,err,error,*999)
+            END SELECT
+          ENDIF
         CASE(FIELD_GAUSS_POINT_BASED_INTERPOLATION)            
             
           NULLIFY(quadratureScheme)               
@@ -4028,40 +4104,85 @@ SUBROUTINE FiniteElasticity_StressStrainCalculate(equationsSet,derivedType,field
               & growthValues,values,err,error,*999)
             
             !We only want to store the independent components 
-            SELECT CASE(numberOfDimensions)
-            CASE(3)
-              ! 3 dimensional problem
-              ! ORDER OF THE COMPONENTS: U_11, U_12, U_13, U_22, U_23, U_33 (upper triangular matrix)
-              CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & gaussIdx,elementNumber,1,values(1,1),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & gaussIdx,elementNumber,2,values(1,2),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & gaussIdx,elementNumber,3,values(1,3),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & gaussIdx,elementNumber,4,values(2,2),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & gaussIdx,elementNumber,5,values(2,3),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & gaussIdx,elementNumber,6,values(3,3),err,error,*999)
-            CASE(2)
-              ! 2 dimensional problem
-              ! ORDER OF THE COMPONENTS: U_11, U_12, U_22 (upper triangular matrix)
-              CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & gaussIdx,elementNumber,1,values(1,1),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & gaussIdx,elementNumber,2,values(1,2),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & gaussIdx,elementNumber,3,values(2,2),err,error,*999)
-            CASE(1)
-              ! 1 dimensional problem
-              CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & gaussIdx,elementNumber,1,values(1,1),err,error,*999)
-            CASE DEFAULT
-              localError="The number of dimensions of "//TRIM(NumberToVString(numberofDimensions,"*",err,error))// &
-                & " is invalid."
-              CALL FlagError(localError,err,error,*999)
-            END SELECT
+            IF(numberOfComponents==numberOfFullComponents) THEN
+              SELECT CASE(numberOfDimensions)
+              CASE(3)
+                ! 3 dimensional problem
+                ! ORDER OF THE COMPONENTS: U_11, U_12, U_13, U_21, U_22, U_23, U_13, U_23, U_33 (full matrix)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,1,values(1,1),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,2,values(1,2),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,3,values(1,3),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,4,values(2,1),err,error,*999)
+                 CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,5,values(2,2),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,6,values(2,3),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,7,values(3,1),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,8,values(3,2),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,9,values(3,3),err,error,*999)
+              CASE(2)
+                ! 2 dimensional problem
+                ! ORDER OF THE COMPONENTS: U_11, U_12, U_21, U_22 (full matrix)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,1,values(1,1),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,2,values(1,2),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,3,values(2,1),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,4,values(2,2),err,error,*999)
+              CASE(1)
+                ! 1 dimensional problem
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,1,values(1,1),err,error,*999)
+              CASE DEFAULT
+                localError="The number of dimensions of "//TRIM(NumberToVString(numberofDimensions,"*",err,error))// &
+                  & " is invalid."
+                CALL FlagError(localError,err,error,*999)
+              END SELECT
+            ELSE
+              SELECT CASE(numberOfDimensions)
+              CASE(3)
+                ! 3 dimensional problem
+                ! ORDER OF THE COMPONENTS: U_11, U_12, U_13, U_22, U_23, U_33 (upper triangular matrix)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,1,values(1,1),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,2,values(1,2),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,3,values(1,3),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,4,values(2,2),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,5,values(2,3),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,6,values(3,3),err,error,*999)
+              CASE(2)
+                ! 2 dimensional problem
+                ! ORDER OF THE COMPONENTS: U_11, U_12, U_22 (upper triangular matrix)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,1,values(1,1),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,2,values(1,2),err,error,*999)
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,3,values(2,2),err,error,*999)
+              CASE(1)
+                ! 1 dimensional problem
+                CALL Field_ParameterSetUpdateLocalGaussPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & gaussIdx,elementNumber,1,values(1,1),err,error,*999)
+              CASE DEFAULT
+                localError="The number of dimensions of "//TRIM(NumberToVString(numberofDimensions,"*",err,error))// &
+                  & " is invalid."
+                CALL FlagError(localError,err,error,*999)
+              END SELECT
+            ENDIF
           ENDDO !gaussIdx/
         CASE(FIELD_DATA_POINT_BASED_INTERPOLATION)
           
@@ -4095,40 +4216,85 @@ SUBROUTINE FiniteElasticity_StressStrainCalculate(equationsSet,derivedType,field
               & growthValues,values,err,error,*999)
             
             !We only want to store the independent components 
-            SELECT CASE(numberOfDimensions)
-            CASE(3)
-              ! 3 dimensional problem
-              ! ORDER OF THE COMPONENTS: U_11, U_12, U_13, U_22, U_23, U_33 (upper triangular matrix)
-              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & elementNumber,1,values(1,1),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & elementNumber,2,values(1,2),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & elementNumber,3,values(1,3),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & elementNumber,4,values(2,2),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & elementNumber,5,values(2,3),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-              & elementNumber,6,values(3,3),err,error,*999)
-            CASE(2)
-              ! 2 dimensional problem
-              ! ORDER OF THE COMPONENTS: U_11, U_12, U_22 (upper triangular matrix)
-              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & elementNumber,1,values(1,1),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & elementNumber,2,values(1,2),err,error,*999)
-              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & elementNumber,3,values(2,2),err,error,*999)
-            CASE(1)
-              ! 1 dimensional problem
-              CALL Field_ParameterSetUpdateLocalElement(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
-                & elementNumber,1,values(1,1),err,error,*999)
-            CASE DEFAULT
-              localError="The number of dimensions of "//TRIM(NumberToVString(numberofDimensions,"*",err,error))// &
-                & " is invalid."
-              CALL FlagError(localError,err,error,*999)
-            END SELECT
+            IF(numberOfComponents==numberOfFullComponents) THEN
+              SELECT CASE(numberOfDimensions)
+              CASE(3)
+                ! 3 dimensional problem
+                ! ORDER OF THE COMPONENTS: U_11, U_12, U_13, U_21, U_22, U_23, U_13, U_23, U_33 (full matrix)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,1,values(1,1),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,2,values(1,2),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,3,values(1,3),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,4,values(2,1),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,5,values(2,2),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,6,values(2,3),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,7,values(3,1),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,8,values(3,2),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,9,values(3,3),err,error,*999)
+              CASE(2)
+                ! 2 dimensional problem
+                ! ORDER OF THE COMPONENTS: U_11, U_12, U_21, U_22 (full matrix)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,1,values(1,1),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,2,values(1,2),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,3,values(2,1),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,4,values(2,2),err,error,*999)
+              CASE(1)
+                ! 1 dimensional problem
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,1,values(1,1),err,error,*999)
+              CASE DEFAULT
+                localError="The number of dimensions of "//TRIM(NumberToVString(numberofDimensions,"*",err,error))// &
+                  & " is invalid."
+                CALL FlagError(localError,err,error,*999)
+              END SELECT
+            ELSE
+              SELECT CASE(numberOfDimensions)
+              CASE(3)
+                ! 3 dimensional problem
+                ! ORDER OF THE COMPONENTS: U_11, U_12, U_13, U_22, U_23, U_33 (upper triangular matrix)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,1,values(1,1),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,2,values(1,2),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,3,values(1,3),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,4,values(2,2),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,5,values(2,3),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,6,values(3,3),err,error,*999)
+              CASE(2)
+                ! 2 dimensional problem
+                ! ORDER OF THE COMPONENTS: U_11, U_12, U_22 (upper triangular matrix)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,1,values(1,1),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,2,values(1,2),err,error,*999)
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,3,values(2,2),err,error,*999)
+              CASE(1)
+                ! 1 dimensional problem
+                CALL Field_ParameterSetUpdateElementDataPoint(field,fieldVarType,FIELD_VALUES_SET_TYPE, &
+                  & elementUserNumber,dataPointIdx,1,values(1,1),err,error,*999)
+              CASE DEFAULT
+                localError="The number of dimensions of "//TRIM(NumberToVString(numberofDimensions,"*",err,error))// &
+                  & " is invalid."
+                CALL FlagError(localError,err,error,*999)
+              END SELECT
+            ENDIF
                       
           ENDDO !dataPointIdx
           
@@ -4216,8 +4382,8 @@ SUBROUTINE FiniteElasticity_StressStrainPoint(equationsSet,evaluateType,numberOf
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string.
     ! Local variables
     INTEGER(INTG) :: fieldInterpolation,i,nh,mh
-    REAL(DP) :: b(3,3),C(3,3),dZdNu(3,3),Fe(3,3),Fg(3,3),Je,Jg,Jznu
-    REAL(DP) :: E(3,3),cauchyStressTensor(3,3),cauchyStressVoigt(6)
+    REAL(DP) :: b(3,3),C(3,3),dZdNu(3,3),Fe(3,3),Fg(3,3),Je,Jg,Jznu,dZdX(3,3),dNuodNu(3,3)
+    REAL(DP) :: E(3,3),cauchyStressTensor(3,3),cauchyStressVoigt(6),cauchyStressTensorFbr(3,3)
     TYPE(FIELD_INTERPOLATED_POINT_TYPE), POINTER :: darcyInterpolatedPoint
     TYPE(VARYING_STRING) :: localError
 
@@ -4253,7 +4419,10 @@ SUBROUTINE FiniteElasticity_StressStrainPoint(equationsSet,evaluateType,numberOf
       ENDDO !i
     ENDIF
 
-    IF(evaluateType==EQUATIONS_SET_CAUCHY_STRESS_TENSOR) THEN
+    IF(evaluateType==EQUATIONS_SET_CAUCHY_STRESS_TENSOR .OR. &
+      & evaluateType==EQUATIONS_SET_CAUCHY_STRESS_TENSOR_FIBRE .OR. &
+      & evaluateType==EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_SPATIAL .OR. &
+      & evaluateType==EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_FIBRE) THEN
 !!\TODO the whole stress thing needs to be looked at as the routines below do not take in the deformation gradient that
 !! is calculated above but rather they calculate it internally. This will lead to mismatches as things like growth are
 !! not taken into account. 
@@ -4279,10 +4448,11 @@ SUBROUTINE FiniteElasticity_StressStrainPoint(equationsSet,evaluateType,numberOf
             cauchyStressTensor(mh,nh)=cauchyStressVoigt(TENSOR_TO_VOIGT(mh,nh,numberOfDimensions))
           ENDDO
         ENDDO
-      CASE(EQUATIONS_SET_ORTHOTROPIC_MATERIAL_COSTA_SUBTYPE, EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE)
+      CASE(EQUATIONS_SET_ORTHOTROPIC_MATERIAL_COSTA_SUBTYPE, EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
+        & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE)
         CALL FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(equationsSet,dependentInterpolatedPoint,materialsInterpolatedPoint, &
           & geometricInterpolatedPoint,darcyInterpolatedPoint,independentInterpolatedPoint, &
-          & cauchyStressTensor,Jznu,dZdNu,elementNumber,0,ERR,ERROR,*999)
+          & cauchyStressTensor,cauchyStressTensorFbr,Jznu,dZdNu,dZdX,dNuodNu,elementNumber,0,ERR,ERROR,*999)
       CASE DEFAULT
         CALL FlagError("Not implemented ",err,error,*999)
       END SELECT
@@ -4291,6 +4461,10 @@ SUBROUTINE FiniteElasticity_StressStrainPoint(equationsSet,evaluateType,numberOf
     SELECT CASE(evaluateType)
     CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR)
       values(1:numberOfDimensions,1:numberOfDimensions)=Fe(1:numberOfDimensions,1:numberOfDimensions)
+    CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_SPATIAL)
+      values(1:numberOfDimensions,1:numberOfDimensions)=dZdX(1:numberOfDimensions,1:numberOfDimensions)
+    CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_FIBRE)
+      values(1:numberOfDimensions,1:numberOfDimensions)=dNuodNu(1:numberOfDimensions,1:numberOfDimensions)
     CASE(EQUATIONS_SET_R_CAUCHY_GREEN_DEFORMATION_TENSOR)
       values(1:numberOfDimensions,1:numberOfDimensions)=C(1:numberOfDimensions,1:numberOfDimensions)
     CASE(EQUATIONS_SET_L_CAUCHY_GREEN_DEFORMATION_TENSOR)
@@ -4299,6 +4473,8 @@ SUBROUTINE FiniteElasticity_StressStrainPoint(equationsSet,evaluateType,numberOf
       values(1:numberOfDimensions,1:numberOfDimensions)=E(1:numberOfDimensions,1:numberOfDimensions)
     CASE(EQUATIONS_SET_CAUCHY_STRESS_TENSOR)
       values(1:numberOfDimensions,1:numberOfDimensions)=cauchyStressTensor(1:numberOfDimensions,1:numberOfDimensions)
+    CASE(EQUATIONS_SET_CAUCHY_STRESS_TENSOR_FIBRE)
+      values(1:numberOfDimensions,1:numberOfDimensions)=cauchyStressTensorFbr(1:numberOfDimensions,1:numberOfDimensions)
     CASE(EQUATIONS_SET_SECOND_PK_STRESS_TENSOR)
       CALL FlagError("Not implemented.",err,error,*999)
     CASE DEFAULT
@@ -4333,7 +4509,8 @@ SUBROUTINE FiniteElasticity_TensorInterpolateGaussPoint(equationsSet,tensorEvalu
     INTEGER(INTG) :: dependentVarType,meshComponentNumber
     INTEGER(INTG) :: numberOfDimensions,numberOfXi
     INTEGER(INTG) :: localElementNumber,i,nh,mh
-    REAL(DP) :: C(3,3),dZdNu(3,3),E(3,3),cauchyStressTensor(3,3),cauchyStressVoigt(6),Fe(3,3),Fg(3,3),growthValues(3),Je,Jg,Jznu
+    REAL(DP) :: C(3,3),dZdNu(3,3),E(3,3),cauchyStressTensor(3,3),cauchyStressVoigt(6),Fe(3,3),Fg(3,3),growthValues(3),Je,Jg,Jznu, &
+      & cauchyStressTensorFbr(3,3),dZdX(3,3),dNuodNu(3,3)
     LOGICAL :: userElementExists,ghostElement
     TYPE(BASIS_TYPE), POINTER :: elementBasis
     TYPE(COORDINATE_SYSTEM_TYPE), POINTER :: coordinateSystem
@@ -4484,7 +4661,10 @@ SUBROUTINE FiniteElasticity_TensorInterpolateGaussPoint(equationsSet,tensorEvalu
       ENDDO !i
     ENDIF
 
-    IF(tensorEvaluateType==EQUATIONS_SET_CAUCHY_STRESS_TENSOR) THEN
+    IF(tensorEvaluateType==EQUATIONS_SET_CAUCHY_STRESS_TENSOR .OR. &
+      & tensorEvaluateType==EQUATIONS_SET_CAUCHY_STRESS_TENSOR_FIBRE .OR. &
+      & tensorEvaluateType==EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_SPATIAL .OR. &
+      & tensorEvaluateType==EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_FIBRE) THEN
       !Get the interpolation parameters for this element
       CALL Field_InterpolationParametersElementGet(FIELD_VALUES_SET_TYPE,localElementNumber, &
         & equations%interpolation%materialsInterpParameters(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
@@ -4530,10 +4710,11 @@ SUBROUTINE FiniteElasticity_TensorInterpolateGaussPoint(equationsSet,tensorEvalu
             cauchyStressTensor(mh,nh)=cauchyStressVoigt(TENSOR_TO_VOIGT3(mh,nh))
           ENDDO
         ENDDO
-      CASE(EQUATIONS_SET_ORTHOTROPIC_MATERIAL_COSTA_SUBTYPE, EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE)
+      CASE(EQUATIONS_SET_ORTHOTROPIC_MATERIAL_COSTA_SUBTYPE, EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
+        & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE)
         CALL FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(equationsSet,dependentInterpolatedPoint,materialsInterpolatedPoint, &
           & geometricInterpolatedPoint,darcyInterpolatedPoint,independentInterpolatedPoint, &
-          & cauchyStressTensor,Jznu,dZdNu,localElementNumber,0,ERR,ERROR,*999)
+          & cauchyStressTensor,cauchyStressTensorFbr,Jznu,dZdNu,dZdX,dNuodNu,localElementNumber,0,ERR,ERROR,*999)
       CASE DEFAULT
         CALL FlagError("Not implemented ",err,error,*999)
       END SELECT
@@ -4542,12 +4723,18 @@ SUBROUTINE FiniteElasticity_TensorInterpolateGaussPoint(equationsSet,tensorEvalu
     SELECT CASE(tensorEvaluateType)
     CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR)
       values(1:numberOfDimensions,1:numberOfDimensions)=dZdNu(1:numberOfDimensions,1:numberOfDimensions)
+    CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_SPATIAL)
+      values(1:numberOfDimensions,1:numberOfDimensions)=dZdX(1:numberOfDimensions,1:numberOfDimensions)
+    CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_FIBRE)
+      values(1:numberOfDimensions,1:numberOfDimensions)=dNuodNu(1:numberOfDimensions,1:numberOfDimensions)
     CASE(EQUATIONS_SET_R_CAUCHY_GREEN_DEFORMATION_TENSOR)
       values(1:numberOfDimensions,1:numberOfDimensions)=C(1:numberOfDimensions,1:numberOfDimensions)
     CASE(EQUATIONS_SET_GREEN_LAGRANGE_STRAIN_TENSOR)
       values(1:numberOfDimensions,1:numberOfDimensions)=E(1:numberOfDimensions,1:numberOfDimensions)
     CASE(EQUATIONS_SET_CAUCHY_STRESS_TENSOR)
       values(1:numberOfDimensions,1:numberOfDimensions)=cauchyStressTensor(1:numberOfDimensions,1:numberOfDimensions)
+    CASE(EQUATIONS_SET_CAUCHY_STRESS_TENSOR_FIBRE)
+      values(1:numberOfDimensions,1:numberOfDimensions)=cauchyStressTensorFbr(1:numberOfDimensions,1:numberOfDimensions)
     CASE(EQUATIONS_SET_SECOND_PK_STRESS_TENSOR)
       CALL FlagError("Not implemented.",err,error,*999)
     CASE DEFAULT
@@ -4596,7 +4783,8 @@ SUBROUTINE FiniteElasticity_TensorInterpolateXi(equationsSet,tensorEvaluateType,
     INTEGER(INTG) :: dependentVarType,meshComponentNumber
     INTEGER(INTG) :: numberOfDimensions,numberOfXi
     INTEGER(INTG) :: localElementNumber,i,nh,mh
-    REAL(DP) :: dZdNu(3,3),dZdNuT(3,3),dZdXi(3,3),AZL(3,3),E(3,3),cauchyStressTensor(3,3),cauchyStressVoigt(6),Jznu
+    REAL(DP) :: dZdNu(3,3),dZdNuT(3,3),dZdXi(3,3),AZL(3,3),E(3,3),cauchyStressTensor(3,3),cauchyStressVoigt(6),Jznu, &
+      & cauchyStressTensorFbr(3,3),dZdX(3,3),dNuodNu(3,3)
 
     ENTERS("FiniteElasticity_TensorInterpolateXi",err,error,*999)
 
@@ -4700,7 +4888,10 @@ SUBROUTINE FiniteElasticity_TensorInterpolateXi(equationsSet,tensorEvaluateType,
       END DO
     END IF
 
-    IF(tensorEvaluateType==EQUATIONS_SET_CAUCHY_STRESS_TENSOR) THEN
+    IF(tensorEvaluateType==EQUATIONS_SET_CAUCHY_STRESS_TENSOR .OR. &
+      & tensorEvaluateType==EQUATIONS_SET_CAUCHY_STRESS_TENSOR_FIBRE .OR. &
+      & tensorEvaluateType==EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_SPATIAL .OR. &
+      & tensorEvaluateType==EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_FIBRE) THEN
       !Get the interpolation parameters for this element
       CALL FIELD_INTERPOLATION_PARAMETERS_ELEMENT_GET(FIELD_VALUES_SET_TYPE,localElementNumber, &
         & equations%interpolation%materialsInterpParameters(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
@@ -4742,10 +4933,11 @@ SUBROUTINE FiniteElasticity_TensorInterpolateXi(equationsSet,tensorEvaluateType,
             cauchyStressTensor(mh,nh)=cauchyStressVoigt(TENSOR_TO_VOIGT3(mh,nh))
           ENDDO
         ENDDO
-      CASE(EQUATIONS_SET_ORTHOTROPIC_MATERIAL_COSTA_SUBTYPE, EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE)
+      CASE(EQUATIONS_SET_ORTHOTROPIC_MATERIAL_COSTA_SUBTYPE, EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
+        & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE)
         CALL FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(equationsSet,dependentInterpolatedPoint,materialsInterpolatedPoint, &
           & geometricInterpolatedPoint,darcyInterpolatedPoint,independentInterpolatedPoint, &
-          & cauchyStressTensor,Jznu,dZdNu,localElementNumber,0,ERR,ERROR,*999)
+          & cauchyStressTensor,cauchyStressTensorFbr,Jznu,dZdNu,dZdX,dNuodNu,localElementNumber,0,ERR,ERROR,*999)
       CASE DEFAULT
         CALL FlagError("Not implemented ",err,error,*999)
       END SELECT
@@ -4754,12 +4946,18 @@ SUBROUTINE FiniteElasticity_TensorInterpolateXi(equationsSet,tensorEvaluateType,
     SELECT CASE(tensorEvaluateType)
     CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR)
       values=dZdNu
+    CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_SPATIAL)
+      values=dZdX
+    CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_FIBRE)
+      values=dNuodNu
     CASE(EQUATIONS_SET_R_CAUCHY_GREEN_DEFORMATION_TENSOR)
       values=AZL
     CASE(EQUATIONS_SET_GREEN_LAGRANGE_STRAIN_TENSOR)
       values=E
     CASE(EQUATIONS_SET_CAUCHY_STRESS_TENSOR)
       values=cauchyStressTensor
+    CASE(EQUATIONS_SET_CAUCHY_STRESS_TENSOR_FIBRE)
+      values=cauchyStressTensorFbr
     CASE(EQUATIONS_SET_SECOND_PK_STRESS_TENSOR)
       CALL FlagError("Not implemented.",err,error,*999)
     CASE DEFAULT
@@ -5032,7 +5230,8 @@ SUBROUTINE FiniteElasticity_SurfacePressureResidualEvaluate(EQUATIONS_SET,ELEMEN
     nonlinearMatrices=>vectorEquations%vectorMatrices%nonlinearMatrices
     EQUATIONS_SET_SUBTYPE = EQUATIONS_SET%SPECIFICATION(3)
 
-    IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+    IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+      & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
       DEPENDENT_FIELD=>equations%interpolation%geometricField
     ELSE
       DEPENDENT_FIELD=>equations%interpolation%dependentField
@@ -5071,7 +5270,8 @@ SUBROUTINE FiniteElasticity_SurfacePressureResidualEvaluate(EQUATIONS_SET,ELEMEN
           DEPENDENT_FACE_BASIS=>DECOMPOSITION%DOMAIN(MESH_COMPONENT_NUMBER)%ptr%TOPOLOGY%FACES%FACES(face_number)%BASIS
           FACE_QUADRATURE_SCHEME=>DEPENDENT_FACE_BASIS%QUADRATURE%QUADRATURE_SCHEME_MAP(BASIS_DEFAULT_QUADRATURE_SCHEME)%ptr
           
-          IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
+          IF (EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE .OR. &
+            & EQUATIONS_SET_SUBTYPE == EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
             FACE_DEPENDENT_INTERPOLATION_PARAMETERS=>equations%interpolation%geometricInterpParameters(FIELD_VAR_U_TYPE)%ptr
             FACE_DEPENDENT_INTERPOLATED_POINT=>equations%interpolation%geometricInterpPoint(FIELD_VAR_U_TYPE)%ptr
             FACE_DEPENDENT_INTERPOLATED_POINT_METRICS=>equations%interpolation% &
@@ -5218,25 +5418,52 @@ END SUBROUTINE FiniteElasticity_GaussDeformationGradientTensor
   !>Evaluates the Cauchy stress tensor at a given Gauss point
   SUBROUTINE FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPOLATED_POINT, &
       & MATERIALS_INTERPOLATED_POINT,GEOMETRIC_INTERPOLATED_POINT,DARCY_DEPENDENT_INTERPOLATED_POINT, &
-      & INDEPENDENT_INTERPOLATED_POINT,CAUCHY_TENSOR,Jznu,DZDNU,ELEMENT_NUMBER,GAUSS_POINT_NUMBER,err,error,*)
+      & INDEPENDENT_INTERPOLATED_POINT,CAUCHY_TENSOR,CAUCHY_TENSOR_FBR,Jznu,DZDNU,DZDX,DNUODNU, &
+      & ELEMENT_NUMBER,GAUSS_POINT_NUMBER,err,error,*)
 
     !Argument variables
     TYPE(EQUATIONS_SET_TYPE), POINTER, INTENT(IN) :: EQUATIONS_SET !<A pointer to the equations set
     TYPE(FIELD_INTERPOLATED_POINT_TYPE), POINTER :: DEPENDENT_INTERPOLATED_POINT,MATERIALS_INTERPOLATED_POINT
     TYPE(FIELD_INTERPOLATED_POINT_TYPE), POINTER :: DARCY_DEPENDENT_INTERPOLATED_POINT,GEOMETRIC_INTERPOLATED_POINT
     TYPE(FIELD_INTERPOLATED_POINT_TYPE), POINTER :: INDEPENDENT_INTERPOLATED_POINT
+    TYPE(FIELD_INTERPOLATED_POINT_TYPE), POINTER :: FIBRE_INTERPOLATED_POINT
     REAL(DP), INTENT(OUT) :: CAUCHY_TENSOR(:,:)
     REAL(DP), INTENT(OUT) :: Jznu !Determinant of deformation gradient tensor (AZL)
     REAL(DP), INTENT(IN) :: DZDNU(3,3) !Deformation gradient tensor at the Guass point
     INTEGER(INTG), INTENT(IN) :: ELEMENT_NUMBER,GAUSS_POINT_NUMBER !<Element/Gauss point number
     INTEGER(INTG), INTENT(OUT) :: ERR !<The error code
     TYPE(VARYING_STRING), INTENT(OUT) :: ERROR !<The error string
+    REAL(DP), INTENT(OUT) :: CAUCHY_TENSOR_FBR(:,:) ! cauchy stress wrt orthogongal deformed fibre coordinates
+    REAL(DP), INTENT(OUT) :: DZDX(:,:) !Deformation gradient tensor mapping spatial coordinates
+    REAL(DP), INTENT(OUT) :: DNUODNU(:,:) !Deformation gradient tensor mapping fibre coordinates
     !Local Variables
     INTEGER(INTG) :: EQUATIONS_SET_SUBTYPE !<The equation subtype
-    INTEGER(INTG) :: i,j,k,PRESSURE_COMPONENT,component_idx,dof_idx
+    INTEGER(INTG) :: i,j,k,PRESSURE_COMPONENT,component_idx,component_idx2,dof_idx
     REAL(DP) :: activation
     REAL(DP) :: AZL(3,3),AZU(3,3),DZDNUT(3,3),PIOLA_TENSOR(3,3),E(3,3),P,IDENTITY(3,3),AZLT(3,3),AZUT(3,3)
     REAL(DP) :: AZL_SQUARED(3,3)
+    REAL(DP) :: CAUCHY_TENSOR_DEFIBRE(3,3) !Cauchy stress wrt deformed orthogonal fibre coordinates
+    REAL(DP) :: CAUCHY_TENSOR_DEFGEO(3,3) !Cauchy stress wrt deformed geometric coordinates
+    TYPE(FIELD_INTERPOLATED_POINT_METRICS_TYPE), POINTER :: GEOMETRIC_INTERPOLATED_POINT_METRICS
+    TYPE(FIELD_INTERPOLATED_POINT_METRICS_TYPE), POINTER :: DEPENDENT_INTERPOLATED_POINT_METRICS
+    REAL(DP) :: XR(3,3), XD(3,3) ! geometrical coordinates with respect to xi
+    REAL(DP) :: NUR(3,3), NUD(3,3), NUDO(3,3) ! material coordinates with respect to xi
+    INTEGER(INTG) :: numberOfXDimensions, numberOfXiDimensions, numberOfNuDimensions ! dimensions of coordinate systems
+    REAL(DP) :: DXDNU(3,3) ! tensor to transform from the geometric coordinate system to the material coordinate system
+    REAL(DP) :: DNUDX(3,3) ! tensor to transform from the material system to the geometric coordinate system
+    REAL(DP) :: DNUDXI(3,3) ! tensor to transform from the material system to the xi coordinate system
+    REAL(DP) :: DXIDNU(3,3) ! tensor to transform from the xi coordinate system to the material coordinate system
+    REAL(DP) :: DNUDZ(3,3) !Inverse of the deformation gradient DZDNU
+    REAL(DP) :: DET_NUD, DET_NUDO, DET_DZDNUO, DET_DZDNUOT ! determinant of deformed material coordinates, transformation tensors
+    REAL(DP) :: NUDO_INV(3,3) ! inverse of the orthogonal deformed material coordinates
+    REAL(DP) :: TEMP_ROT(3,3), TEMP_ROT2(3,3) ! just some temporary storage
+    REAL(DP) :: DZDNUO(3,3) ! tensor to transform from orthogonal fibre to spatial coordinates
+    REAL(DP) :: DNUODZ(3,3) ! tensor to transform from spatial to orthogonal fibre coordinates
+    REAL(DP) :: DZDNUOT(3,3), DNUODZT(3,3) ! transpose of DZDNUO, DNUODZT
+    REAL(DP) :: fibre_def(3), sheet_def(3), normal_def(3) ! deformed material coordinate vectors
+    REAL(DP) :: CDT(3,3), CDT_TEMP(3,3), DET_CDT, lambda_g(3,3), TEMP_LAMBDA, CDT_FBR(3,3) ! the cauchy deformation tensor
+    REAL(DP) :: AZL_INV(3,3) ! (F'*F)^-1
+    REAL(DP) :: XID(3,3), DET_DNUODZ
     REAL(DP) :: I1,I2,I3            !Invariants, if needed
     REAL(DP) :: ACTIVE_STRESS_11,ACTIVE_STRESS_22,ACTIVE_STRESS_33 !Active stress to be copied in from independent field.
     REAL(DP) :: TEMP(3,3),TEMPTERM  !Temporary variables
@@ -6038,7 +6265,17 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
       & EQUATIONS_SET_INCOMPRESSIBLE_FINITE_ELASTICITY_DARCY_SUBTYPE,EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE, &
       & EQUATIONS_SET_1D3D_MONODOMAIN_ELASTICITY_SUBTYPE,EQUATIONS_SET_TRANSVERSE_ISOTROPIC_POLYNOMIAL_SUBTYPE, &
       & EQUATIONS_SET_MONODOMAIN_ELASTICITY_W_TITIN_SUBTYPE,EQUATIONS_SET_MONODOMAIN_ELASTICITY_VELOCITY_SUBTYPE, &
-      & EQUATIONS_SET_TRANSVERSE_ISOTROPIC_ACTIVE_SUBTYPE,EQUATIONS_SET_MR_AND_GROWTH_LAW_IN_CELLML_SUBTYPE)
+      & EQUATIONS_SET_TRANSVERSE_ISOTROPIC_ACTIVE_SUBTYPE,EQUATIONS_SET_MR_AND_GROWTH_LAW_IN_CELLML_SUBTYPE, &
+      & EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE)
+
+      IF(EQUATIONS_SET%specification(3)==EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
+        PRESSURE_COMPONENT=GEOMETRIC_INTERPOLATED_POINT%INTERPOLATION_PARAMETERS%FIELD_VARIABLE%NUMBER_OF_COMPONENTS
+        P=GEOMETRIC_INTERPOLATED_POINT%VALUES(PRESSURE_COMPONENT,NO_PART_DERIV)
+      ELSE
+        PRESSURE_COMPONENT=DEPENDENT_INTERPOLATED_POINT%INTERPOLATION_PARAMETERS%FIELD_VARIABLE%NUMBER_OF_COMPONENTS
+        P=DEPENDENT_INTERPOLATED_POINT%VALUES(PRESSURE_COMPONENT,NO_PART_DERIV)
+      ENDIF
+
       !Form of constitutive model is:
       ! W=c1*(I1-3)+c2*(I2-3)+p*(I3-1)
       !Also assumed I3 = det(AZL) = 1.0
@@ -6512,6 +6749,7 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
       PIOLA_TENSOR(3,2)=PIOLA_TENSOR(2,3)
       PIOLA_TENSOR(3,3)=(C(2)+C(4)*E(3,3))*TEMPTERM+2.0_DP*P*AZU(3,3)
     CASE(EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE,EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
+      & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
       & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE)
       ! W=C1/2*exp*(Q) + p(J-1)
       ! Q=C2*E(1,1)^2 + C3*(E(2,2)^2+E(3,3)^2+2*E(2,3)*E(3,2)) + 2*C4*(E(1,2)*E(2,1)+E(1,3)*E(3,1))
@@ -6558,6 +6796,39 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
       IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE) THEN
       !add active contraction stress value to the trace of the stress tensor - basically adding to hydrostatic pressure.
       !the active stress is stored inside the independent field that has been set up in the user program.
+      !for generality we could set up 3 components in independent field for 3 different active stress components
+        !lambda = 1.0_DP
+        !lambda(1) = SQRT(AZL(1,1))
+        !lambda(2) = SQRT(AZL(2,2))
+        !lambda(3) = SQRT(AZL(3,3))
+        !CALL Invert(DZDNU,DNUDZ,Jznu,err,error,*999)
+        !CALL Field_VariableGet(EQUATIONS_SET%INDEPENDENT%INDEPENDENT_FIELD,FIELD_U_VARIABLE_TYPE,FIELD_VARIABLE,err,error,*999)
+        !DO component_idx=1,FIELD_VARIABLE%NUMBER_OF_COMPONENTS
+        !  SELECT CASE(FIELD_VARIABLE%COMPONENTS(component_idx)%INTERPOLATION_TYPE)
+        !  CASE(FIELD_CONSTANT_INTERPOLATION)
+        !    VALUE=0.1_DP
+        !  CASE(FIELD_GAUSS_POINT_BASED_INTERPOLATION)
+        !    dof_idx=FIELD_VARIABLE%COMPONENTS(component_idx)%PARAM_TO_DOF_MAP%GAUSS_POINT_PARAM2DOF_MAP% &
+        !      & GAUSS_POINTS(GAUSS_POINT_NUMBER,ELEMENT_NUMBER)
+        !    CALL FIELD_PARAMETER_SET_GET_LOCAL_DOF(EQUATIONS_SET%INDEPENDENT%INDEPENDENT_FIELD,FIELD_U_VARIABLE_TYPE, &
+        !      & FIELD_VALUES_SET_TYPE,dof_idx,VALUE,err,error,*999)
+        !  CASE(FIELD_ELEMENT_BASED_INTERPOLATION)
+        !    VALUE=INDEPENDENT_INTERPOLATED_POINT%VALUES(component_idx,NO_PART_DERIV)
+        !  CASE DEFAULT
+        !    LOCAL_ERROR="This independent field variable interpolation type is not supported."
+        !    CALL FlagError(LOCAL_ERROR,err,error,*999)
+        !  END SELECT
+          !PIOLA_TENSOR(component_idx,component_idx)=PIOLA_TENSOR(component_idx,component_idx)+ &
+          !  & VALUE*(1.0_DP+1.45_DP*(lambda(component_idx)-1.0_DP))/DZDNU(component_idx,component_idx)
+          !PIOLA_TENSOR(component_idx,component_idx)=PIOLA_TENSOR(component_idx,component_idx)+ &
+          !  & VALUE*(1.0_DP+1.45_DP*(lambda(component_idx)-1.0_DP))!*DNUDZ(component_idx,component_idx)
+          !PIOLA_TENSOR(component_idx,component_idx)=PIOLA_TENSOR(component_idx,component_idx)+ &
+          !  & VALUE*(1.0_DP+1.45_DP*(lambda(component_idx)-1.0_DP))
+        !ENDDO
+      ENDIF
+      IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE) THEN
+      !add active contraction stress value (without lenght dependence) to the trace of the stress tensor - basically adding to hydrostatic pressure.
+      !the active stress is stored inside the independent field that has been set up in the user program.
       !for generality we could set up 3 components in independent field for 3 different active stress components
         lambda = 1.0_DP
         !lambda(1) = SQRT(AZL(1,1))
@@ -6565,7 +6836,8 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
         DO component_idx=1,FIELD_VARIABLE%NUMBER_OF_COMPONENTS
           SELECT CASE(FIELD_VARIABLE%COMPONENTS(component_idx)%INTERPOLATION_TYPE)
           CASE(FIELD_CONSTANT_INTERPOLATION)
-            VALUE=0.1_DP
+            LOCAL_ERROR="Activation Field constant interpolation not implemented."
+            CALL FlagError(LOCAL_ERROR,err,error,*999)
           CASE(FIELD_GAUSS_POINT_BASED_INTERPOLATION)
             dof_idx=FIELD_VARIABLE%COMPONENTS(component_idx)%PARAM_TO_DOF_MAP%GAUSS_POINT_PARAM2DOF_MAP% &
               & GAUSS_POINTS(GAUSS_POINT_NUMBER,ELEMENT_NUMBER)
@@ -6578,7 +6850,7 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
             CALL FlagError(LOCAL_ERROR,err,error,*999)
           END SELECT
           PIOLA_TENSOR(component_idx,component_idx)=PIOLA_TENSOR(component_idx,component_idx)+ &
-            & VALUE*(1.0_DP+1.45_DP*(lambda(component_idx)-1.0_DP))/DZDNU(component_idx,component_idx)
+            & VALUE
         ENDDO
       ENDIF
     CASE(EQUATIONS_SET_TRANSVERSE_ISOTROPIC_HUMPHREY_YIN_SUBTYPE)
@@ -6826,10 +7098,252 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_CAUCHY_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
       CALL FlagError(LOCAL_ERROR,err,error,*999)
     END SELECT
 
+    IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE) THEN
+    ! Active contraction subtype used for the Benchmark problem.
+    ! The active stress stored inside the independent field, set up by the user program is interpreted
+    ! as constant 2nd PK.
+      CALL Field_VariableGet(EQUATIONS_SET%INDEPENDENT%INDEPENDENT_FIELD,FIELD_U_VARIABLE_TYPE,FIELD_VARIABLE,err,error,*999)
+      DO component_idx=1,FIELD_VARIABLE%NUMBER_OF_COMPONENTS
+        SELECT CASE(FIELD_VARIABLE%COMPONENTS(component_idx)%INTERPOLATION_TYPE)
+        CASE(FIELD_CONSTANT_INTERPOLATION)
+          VALUE=INDEPENDENT_INTERPOLATED_POINT%VALUES(component_idx,NO_PART_DERIV)
+          lambda(1)=1.0_DP
+          lambda(2)=1.0_DP
+          lambda(3)=1.0_DP
+        CASE(FIELD_GAUSS_POINT_BASED_INTERPOLATION)
+          lambda(1) = SQRT(AZL(1,1))
+          lambda(2) = SQRT(AZL(2,2))
+          lambda(3) = SQRT(AZL(3,3))
+          dof_idx=FIELD_VARIABLE%COMPONENTS(component_idx)%PARAM_TO_DOF_MAP%GAUSS_POINT_PARAM2DOF_MAP% &
+            & GAUSS_POINTS(GAUSS_POINT_NUMBER,ELEMENT_NUMBER)
+          CALL FIELD_PARAMETER_SET_GET_LOCAL_DOF(EQUATIONS_SET%INDEPENDENT%INDEPENDENT_FIELD,FIELD_U_VARIABLE_TYPE, &
+            & FIELD_VALUES_SET_TYPE,dof_idx,VALUE,err,error,*999)
+        CASE(FIELD_ELEMENT_BASED_INTERPOLATION)
+          lambda(1) = SQRT(AZL(1,1))
+          lambda(2) = SQRT(AZL(2,2))
+          lambda(3) = SQRT(AZL(3,3))
+          VALUE=INDEPENDENT_INTERPOLATED_POINT%VALUES(component_idx,NO_PART_DERIV)
+        CASE DEFAULT
+          LOCAL_ERROR="This independent field variable interpolation type is not supported."
+          CALL FlagError(LOCAL_ERROR,err,error,*999)
+        END SELECT
+        PIOLA_TENSOR(component_idx,component_idx)=PIOLA_TENSOR(component_idx,component_idx)+ &
+          & VALUE*(1.0_DP+1.45_DP*(lambda(component_idx)-1.0_DP))
+      ENDDO
+    ENDIF
+
     CALL MatrixProduct(DZDNU,PIOLA_TENSOR,TEMP,err,error,*999)
     CALL MatrixProduct(TEMP,DZDNUT,CAUCHY_TENSOR,err,error,*999)
     
+    IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE) THEN
+      ! The active stress stored inside the independent field, set up by the user program is interpreted
+      ! with respect to deformed (orthogonal) material/fibre coordinates.
+      ! For further manipulations we need to transform the active stress from
+      ! the independent field to deformed spatial coordinates.
+      !
+      ! sigma(x) = q * sigma(nu_orthogonal) * q^T
+      ! with: q = dx / dnu_orthogonal
+      !       nu_orthogonal gets constructed from the deformed material coordinates
+
+      ! populate sigma(nu_orthogonal)
+      CALL Field_VariableGet(EQUATIONS_SET%INDEPENDENT%INDEPENDENT_FIELD,FIELD_U_VARIABLE_TYPE,FIELD_VARIABLE,err,error,*999)
+      CALL IdentityMatrix(CAUCHY_TENSOR_DEFIBRE,err,error,*999)
+      DO component_idx=1,FIELD_VARIABLE%NUMBER_OF_COMPONENTS
+        SELECT CASE(FIELD_VARIABLE%COMPONENTS(component_idx)%INTERPOLATION_TYPE)
+        CASE(FIELD_CONSTANT_INTERPOLATION)
+          VALUE=INDEPENDENT_INTERPOLATED_POINT%VALUES(component_idx,NO_PART_DERIV)
+        CASE(FIELD_GAUSS_POINT_BASED_INTERPOLATION)
+          dof_idx=FIELD_VARIABLE%COMPONENTS(component_idx)%PARAM_TO_DOF_MAP%GAUSS_POINT_PARAM2DOF_MAP% &
+            & GAUSS_POINTS(GAUSS_POINT_NUMBER,ELEMENT_NUMBER)
+          CALL FIELD_PARAMETER_SET_GET_LOCAL_DOF(EQUATIONS_SET%INDEPENDENT%INDEPENDENT_FIELD,FIELD_U_VARIABLE_TYPE, &
+            & FIELD_VALUES_SET_TYPE,dof_idx,VALUE,err,error,*999)
+        CASE(FIELD_ELEMENT_BASED_INTERPOLATION)
+          VALUE=INDEPENDENT_INTERPOLATED_POINT%VALUES(component_idx,NO_PART_DERIV)
+        CASE DEFAULT
+          LOCAL_ERROR="This independent field variable interpolation type is not supported."
+          CALL FlagError(LOCAL_ERROR,err,error,*999)
+        END SELECT
+        CAUCHY_TENSOR_DEFIBRE(component_idx,component_idx)=VALUE
+      ENDDO
+      ! create orthogonal deformed fibre coordinate system
+      ! reference metric
+      NULLIFY(GEOMETRIC_INTERPOLATED_POINT_METRICS)
+      GEOMETRIC_INTERPOLATED_POINT_METRICS=>EQUATIONS_SET% &
+        & EQUATIONS%INTERPOLATION%geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr
+      ! deformed metric
+      NULLIFY(DEPENDENT_INTERPOLATED_POINT_METRICS)
+      DEPENDENT_INTERPOLATED_POINT_METRICS=>EQUATIONS_SET% &
+        & EQUATIONS%INTERPOLATION%dependentInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr
+      XR=GEOMETRIC_INTERPOLATED_POINT_METRICS%DX_DXI !reference spatial directions
+      XD=DEPENDENT_INTERPOLATED_POINT_METRICS%DX_DXI !deformed spatial directions
+      ! fibre interpolation
+      NULLIFY(FIBRE_INTERPOLATED_POINT)
+      FIBRE_INTERPOLATED_POINT=>EQUATIONS_SET%EQUATIONS% &
+        & INTERPOLATION%fibreInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr
+      numberOfXDimensions=GEOMETRIC_INTERPOLATED_POINT_METRICS%NUMBER_OF_X_DIMENSIONS
+      numberOfXiDimensions=GEOMETRIC_INTERPOLATED_POINT_METRICS%NUMBER_OF_XI_DIMENSIONS
+      numberOfNuDimensions=SIZE(FIBRE_INTERPOLATED_POINT%VALUES,1)
+      ! call this function to get the transformation tensors between material and spatial coordinates
+      CALL IdentityMatrix(DXDNU,err,error,*999) ! initialise rotation matrix
+      CALL Coordinates_MaterialSystemCalculate(GEOMETRIC_INTERPOLATED_POINT_METRICS,FIBRE_INTERPOLATED_POINT, &
+        & DNUDX,DXDNU,DNUDXI(1:numberOfXDimensions,1:numberOfXiDimensions), &
+        & DXIDNU(1:numberOfXiDimensions,1:numberOfXDimensions),err,error,*999)
+      DO component_idx=1,numberOfXDimensions
+        ! normalise reference and deformed spatial vectors
+        CALL Normalise(XR(1:numberOfXDimensions,component_idx), &
+          & XR(1:numberOfXDimensions,component_idx),err,error,*999)
+        CALL Normalise(XD(1:numberOfXDimensions,component_idx), &
+          & XD(1:numberOfXDimensions,component_idx),err,error,*999)
+      ENDDO
+      ! calculate deformed material coordinates
+      ! dnu/dxi = dz/dNu * dX/dxi
+      CALL MatrixVectorProduct(DZDNU,XR(:,1),fibre_def,err,error,*999)
+      CALL MatrixVectorProduct(DZDNU,XR(:,2),sheet_def,err,error,*999)
+      CALL Normalise(fibre_def,fibre_def,err,error,*999)
+      CALL Normalise(sheet_def,sheet_def,err,error,*999)
+      ! calculate normal vector on the plane spanned by the fibre and sheet vector
+      CALL CrossProduct(fibre_def,sheet_def,normal_def,err,error,*999) ! orthogonal material coorindate 3
+      ! calculate orthogonal sheet vector
+      CALL CrossProduct(fibre_def,normal_def,sheet_def,err,error,*999) ! orthogonal material coorindate 2
+      CALL IdentityMatrix(NUDO,err,error,*999) ! initialise deformed fibre vector matrix
+      NUDO(1:numberOfXDimensions,1)=fibre_def
+      NUDO(1:numberOfXDimensions,2)=sheet_def
+      NUDO(1:numberOfXDimensions,3)=normal_def
+      ! normalise the deformed orthogonal material vectors
+      CALL Normalise(NUDO,NUDO,err,error,*999)
+      DO component_idx=1,numberOfXDimensions
+        CALL Normalise(NUDO(1:numberOfXDimensions,component_idx), &
+          & NUDO(1:numberOfXDimensions,component_idx),err,error,*999)
+      ENDDO
+
+      ! construct the tensor to transform from geometric to orthogonal material coordinates
+      ! we have dnuo/dxi and dxi/dz
+      ! q^-1 = dnuo/dz = dnuo/dxi * dxi/dz
+      CALL IdentityMatrix(XID,err,error,*999) ! initialise dxi/dz
+      XID=DEPENDENT_INTERPOLATED_POINT_METRICS%DXI_DX
+      CALL Normalise(XID,XID,err,error,*999)
+      DO component_idx=1,numberOfXDimensions
+        CALL Normalise(XID(1:numberOfXDimensions,component_idx), &
+          & XID(1:numberOfXDimensions,component_idx),err,error,*999)
+      ENDDO
+
+      CALL IdentityMatrix(DNUODZ,err,error,*999) ! initialise q^-1
+      CALL MatrixProduct(NUDO(1:numberOfXDimensions,1:numberOfXiDimensions), &
+        & XID(1:numberOfXDimensions,1:numberOfXiDimensions), &
+        & DNUODZ(1:numberOfXDimensions,1:numberOfXDimensions),err,error,*999)
+      ! Calculate q
+      CALL IdentityMatrix(DZDNUO,err,error,*999) ! initialise q
+      CALL Invert(DNUODZ,DZDNUO,DET_DNUODZ,err,error,*999)
+      ! Calculate q^-T
+      CALL IdentityMatrix(DNUODZT,err,error,*999) ! initialise q^-T
+      CALL MatrixTranspose(DNUODZ,DNUODZT,err,error,*999)
+      ! Calculate q^T
+      CALL IdentityMatrix(DZDNUOT,err,error,*999) ! initialise q^T
+      CALL MatrixTranspose(DZDNUO,DZDNUOT,err,error,*999)
+
+      ! Add active stress
+      ! Hunter-McCulloch-ter Keurs constitutive model
+      ! T_a = T_Ca * [1 + beta * (lambda - 1)]
+      ! our CAUCHY_TENSOR_DEFGEO equals to T_Ca
+      ! lamda(stretch) wrt reference coordinates:
+      ! lamda = sqrt(C) ... C: right Cauchy-Green strain
+      ! lamda(stretch) wrt deformed coordinates:
+      ! lambda = sqrt(1/(1-2e))
+      !     with:   e(x) = 1/2 * (g - c(x))
+      !             c(x) = F^-T * F^-1
+      ! hence we can express lambda wrt to deformed coordinates
+      ! calculate Cauchy deformation tensor, using the expression
+      ! F^-T * F^-1 = (F * F^T)^-1
+      CALL IdentityMatrix(AZL_INV,err,error,*999) ! initialise left Cauchy-Green
+      CALL IdentityMatrix(CDT,err,error,*999) ! initialise right Cauchy-Green
+      CALL MatrixProduct(DZDNU,DZDNUT,AZL_INV,err,error,*999)
+      CALL Invert(AZL_INV,CDT,DET_CDT,err,error,*999)
+      CALL IdentityMatrix(CDT_TEMP,err,error,*999)
+      ! rotate Cauchy deformation tensor to be with respect to deformed material coordinates
+      ! c(nuo) = q^-1 * c(x) * q^-T
+      CALL MatrixProduct(CDT(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & DNUODZT(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & CDT_TEMP(1:numberOfXDimensions,1:numberOfXDimensions),err,error,*999)
+      CALL MatrixProduct(DNUODZ(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & CDT_TEMP(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & CDT_FBR(1:numberOfXDimensions,1:numberOfXDimensions),err,error,*999)
+
+      IF(FIELD_VARIABLE%COMPONENTS(1)%INTERPOLATION_TYPE==FIELD_CONSTANT_INTERPOLATION) THEN
+        DO component_idx=1,numberOfXDimensions
+          DO j=1,numberOfXDimensions
+            lambda_g(component_idx,j)=1.0_DP
+          ENDDO
+        ENDDO
+      ELSE
+        DO component_idx=1,numberOfXDimensions ! initialise the matrix
+          DO j=1,numberOfXDimensions
+            lambda_g(component_idx,j)=1.0_DP
+          ENDDO
+        ENDDO
+        ! lambda = sqrt(1/c(nuo))
+        DO component_idx=1,numberOfXDimensions
+          TEMP_LAMBDA=CDT(component_idx,component_idx)
+          IF(TEMP_LAMBDA .LT. 0.0_DP) THEN ! avoid negative square root
+            WRITE(*,*) '>>> Warning: Negative square root!'
+            IF(ABS(TEMP_LAMBDA) .LT. 1.e-6) THEN ! avoid division by zero
+              TEMP_LAMBDA=(10.0_DP)**(-6.0_DP)
+            ENDIF
+            TEMP_LAMBDA=ABS(TEMP_LAMBDA)
+          ENDIF
+          IF(TEMP_LAMBDA==0.0_DP) THEN ! avoid division by zero
+            WRITE(*,*) '>>> Warning: Division by zero!'
+            TEMP_LAMBDA=(10.0_DP)**(-6.0_DP)
+          ENDIF
+          lambda_g(component_idx,component_idx)=SQRT(1.0_DP/TEMP_LAMBDA)
+        ENDDO
+      ENDIF
+
+      ! transform the Cauchy stress wrt orthogonal fibres to be wrt spatial coordinates
+      ! sigma(x) = q * sigma(nuo) * q^T
+      CALL IdentityMatrix(TEMP_ROT,err,error,*999) ! initialise temporary variable
+      CALL IdentityMatrix(CAUCHY_TENSOR_DEFGEO,err,error,*999) ! initialise Cauchy tensor wrt deformed spatial
+      CALL MatrixProduct(CAUCHY_TENSOR_DEFIBRE(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & DZDNUOT(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & TEMP_ROT(1:numberOfXDimensions,1:numberOfXDimensions),err,error,*999)
+      CALL MatrixProduct(DZDNUO(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & TEMP_ROT(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & CAUCHY_TENSOR_DEFGEO(1:numberOfXDimensions,1:numberOfXDimensions),err,error,*999)
+      ! calculate active stress components
+      DO component_idx=1,numberOfXDimensions
+        DO j=1,numberOfXDimensions
+          CAUCHY_TENSOR_DEFGEO(component_idx,j)=CAUCHY_TENSOR_DEFGEO(component_idx,j)* &
+            & (1.0_DP+1.45_DP*(lambda_g(component_idx,j)-1.0_DP))
+        ENDDO
+      ENDDO
+
+      ! add active stress components
+      DO component_idx=1,FIELD_VARIABLE%NUMBER_OF_COMPONENTS
+        DO j=1, FIELD_VARIABLE%NUMBER_OF_COMPONENTS
+          CAUCHY_TENSOR(component_idx,j)=CAUCHY_TENSOR(component_idx,j)+ &
+            & CAUCHY_TENSOR_DEFGEO(component_idx,j)
+        ENDDO
+      ENDDO
+    ENDIF
+
     CAUCHY_TENSOR=CAUCHY_TENSOR/Jznu
+
+    IF(EQUATIONS_SET_SUBTYPE==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE) THEN
+      ! rotate the cauchy stress wrt spatial coordinates to be wrt deformed orthogonal fibres
+      ! for exporting and evaluating the stress in fibre direction
+      ! sigma(x) = q * sigma(nuo) * q^T
+      ! sigma(nuo) = q^-1 * sigma(x) * q^-T
+      CALL MatrixProduct(CAUCHY_TENSOR(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & DZDNUOT(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & TEMP_ROT2(1:numberOfXDimensions,1:numberOfXDimensions),err,error,*999)
+      CALL MatrixProduct(DZDNUO(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & TEMP_ROT2(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & CAUCHY_TENSOR_FBR(1:numberOfXDimensions,1:numberOfXDimensions),err,error,*999)
+      ! get the deformation gradient which maps reference and deformed orthogonal fibre coordinates
+      ! dnuo/dnu = dz/dnu * dnuo/dz
+      CALL MatrixProduct(DZDNU(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & DNUODZ(1:numberOfXDimensions,1:numberOfXDimensions), &
+        & DNUODNU(1:numberOfXDimensions,1:numberOfXDimensions),err,error,*999)
+    ENDIF
     IF(DIAGNOSTICS1) THEN
       CALL WRITE_STRING_VALUE(DIAGNOSTIC_OUTPUT_TYPE,"  ELEMENT_NUMBER = ",ELEMENT_NUMBER,err,error,*999)
       CALL WRITE_STRING_VALUE(DIAGNOSTIC_OUTPUT_TYPE,"  gauss_idx = ",GAUSS_POINT_NUMBER,err,error,*999)
@@ -7022,10 +7536,17 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_STRESS_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
 
     SELECT CASE(EQUATIONS_SET%specification(3))
     CASE(EQUATIONS_SET_MOONEY_RIVLIN_ACTIVECONTRACTION_SUBTYPE, &
-      & EQUATIONS_SET_MOONEY_RIVLIN_SUBTYPE, &
+      & EQUATIONS_SET_MOONEY_RIVLIN_SUBTYPE, EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE, &
       & EQUATIONS_SET_MR_AND_GROWTH_LAW_IN_CELLML_SUBTYPE)
-      PRESSURE_COMPONENT=DEPENDENT_INTERPOLATED_POINT%INTERPOLATION_PARAMETERS%FIELD_VARIABLE%NUMBER_OF_COMPONENTS
-      P=DEPENDENT_INTERPOLATED_POINT%VALUES(PRESSURE_COMPONENT,NO_PART_DERIV)
+
+      IF(EQUATIONS_SET%specification(3)==EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE) THEN
+        PRESSURE_COMPONENT=GEOMETRIC_INTERPOLATED_POINT%INTERPOLATION_PARAMETERS%FIELD_VARIABLE%NUMBER_OF_COMPONENTS
+        P=GEOMETRIC_INTERPOLATED_POINT%VALUES(PRESSURE_COMPONENT,NO_PART_DERIV)
+      ELSE
+        PRESSURE_COMPONENT=DEPENDENT_INTERPOLATED_POINT%INTERPOLATION_PARAMETERS%FIELD_VARIABLE%NUMBER_OF_COMPONENTS
+        P=DEPENDENT_INTERPOLATED_POINT%VALUES(PRESSURE_COMPONENT,NO_PART_DERIV)
+      ENDIF
+
       !Form of constitutive model is:
       !W=c1*(I1-3)+c2*(I2-3)+p/2*(I3-1)
 
@@ -7061,7 +7582,8 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_STRESS_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
       STRESS_TENSOR(1:3)=STRESS_TENSOR(1:3)-ONETHIRD_TRACE+P
 
     CASE(EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE,EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
-      & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE)
+      & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE,EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
+      & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE)
       IF(EQUATIONS_SET%specification(3)==EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE) THEN
         PRESSURE_COMPONENT=GEOMETRIC_INTERPOLATED_POINT%INTERPOLATION_PARAMETERS%FIELD_VARIABLE%NUMBER_OF_COMPONENTS
         P=GEOMETRIC_INTERPOLATED_POINT%VALUES(PRESSURE_COMPONENT,NO_PART_DERIV)
@@ -7075,7 +7597,9 @@ SUBROUTINE FINITE_ELASTICITY_GAUSS_STRESS_TENSOR(EQUATIONS_SET,DEPENDENT_INTERPO
       TEMPTERM1=0.5_DP*C(1)*EXP(0.5_DP*DOT_PRODUCT(E,DQ_DE))
       ! Calculate isochoric fictitious 2nd Piola tensor (in Voigt form)
       STRESS_TENSOR=TEMPTERM1*DQ_DE
-      IF(EQUATIONS_SET%specification(3)==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE) THEN
+      IF(EQUATIONS_SET%specification(3)==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE .OR. &
+        & EQUATIONS_SET%specification(3)==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE .OR. &
+        & EQUATIONS_SET%specification(3)==EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE) THEN
         !add active contraction stress values
         !Be aware for modified DZDNU, should active contraction be added here? Normally should be okay as modified DZDNU and DZDNU
         !converge during the Newton iteration.
@@ -7322,7 +7846,8 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
     !Local Variables
     INTEGER(INTG) :: GEOMETRIC_MESH_COMPONENT,GEOMETRIC_SCALING_TYPE,NUMBER_OF_COMPONENTS, &
       & numberOfDimensions,NUMBER_OF_DARCY_COMPONENTS,GEOMETRIC_COMPONENT_NUMBER,NUMBER_OF_COMPONENTS_2,component_idx, &
-      & componentIdx,derivedIdx,varIdx,variableType,NUMBER_OF_FLUID_COMPONENTS,numberOfTensorComponents
+      & componentIdx,derivedIdx,varIdx,variableType,NUMBER_OF_FLUID_COMPONENTS,numberOfSymmetricTensorComponents, &
+      & numberOfFullTensorComponents
     TYPE(COORDINATE_SYSTEM_TYPE), POINTER :: coordinateSystem
     TYPE(DECOMPOSITION_TYPE), POINTER :: GEOMETRIC_DECOMPOSITION
     TYPE(FIELD_TYPE), POINTER :: ANALYTIC_FIELD,DEPENDENT_FIELD,GEOMETRIC_FIELD
@@ -7396,7 +7921,10 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
         & EQUATIONS_SET_ORTHOTROPIC_MATERIAL_HOLZAPFEL_OGDEN_SUBTYPE, &
         & EQUATIONS_SET_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE,EQUATIONS_SET_NEARLY_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE, & 
         & EQUATIONS_SET_INCOMPRESSIBLE_ELAST_MULTI_COMP_DARCY_SUBTYPE,EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
-        & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
+        & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
+        & EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE, &
+        & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+        & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
         & EQUATIONS_SET_CONSTITUTIVE_LAW_IN_CELLML_EVALUATE_SUBTYPE, &
         & EQUATIONS_SET_CONSTITUTIVE_AND_GROWTH_LAW_IN_CELLML_SUBTYPE, &
         & EQUATIONS_SET_GROWTH_LAW_IN_CELLML_SUBTYPE, &
@@ -7481,6 +8009,7 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
             SELECT CASE(EQUATIONS_SET_SUBTYPE)
             CASE(EQUATIONS_SET_MOONEY_RIVLIN_SUBTYPE, &
               & EQUATIONS_SET_MOONEY_RIVLIN_ACTIVECONTRACTION_SUBTYPE, &
+              & EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE, &
               & EQUATIONS_SET_STVENANT_KIRCHOFF_ACTIVECONTRACTION_SUBTYPE, &
               & EQUATIONS_SET_ISOTROPIC_EXPONENTIAL_SUBTYPE, &
               & EQUATIONS_SET_COMPRESSIBLE_FINITE_ELASTICITY_SUBTYPE,&
@@ -7505,6 +8034,8 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
               & EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
               & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
               & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
+              & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+              & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
               & EQUATIONS_SET_CONSTITUTIVE_LAW_IN_CELLML_EVALUATE_SUBTYPE, &
               & EQUATIONS_SET_CONSTITUTIVE_AND_GROWTH_LAW_IN_CELLML_SUBTYPE, &
               & EQUATIONS_SET_GROWTH_LAW_IN_CELLML_SUBTYPE, &
@@ -7590,7 +8121,11 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
             & EQUATIONS_SET_COMPRESSIBLE_ACTIVECONTRACTION_SUBTYPE, &
             & EQUATIONS_SET_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_NO_SUBTYPE,EQUATIONS_SET_MEMBRANE_SUBTYPE, &
             & EQUATIONS_SET_ORTHOTROPIC_MATERIAL_HOLZAPFEL_OGDEN_SUBTYPE,EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
-            & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
+            & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
+            & EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE, &
+            & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+            & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
+            & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
             & EQUATIONS_SET_TRANSVERSE_ISOTROPIC_HUMPHREY_YIN_SUBTYPE, &
             & EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE,EQUATIONS_SET_1D3D_MONODOMAIN_ELASTICITY_SUBTYPE, &
             & EQUATIONS_SET_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE,EQUATIONS_SET_NEARLY_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE, &
@@ -9510,7 +10045,8 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
            !Mooney Rivlin, St Venant Kirchoff and Compressible active contraction subtype
            CASE(EQUATIONS_SET_MOONEY_RIVLIN_ACTIVECONTRACTION_SUBTYPE,EQUATIONS_SET_STVENANT_KIRCHOFF_ACTIVECONTRACTION_SUBTYPE, &
              & EQUATIONS_SET_COMPRESSIBLE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_HOLZAPFEL_OGDEN_ACTIVECONTRACTION_SUBTYPE, &
-             & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE)
+             & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+             & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE)
              NUMBER_OF_COMPONENTS = 3 !one contractile stress value for each of the three directions
              IF(EQUATIONS_SET%INDEPENDENT%INDEPENDENT_FIELD_AUTO_CREATED) THEN
                CALL FIELD_CREATE_START(EQUATIONS_SET_SETUP%FIELD_USER_NUMBER,EQUATIONS_SET%REGION,EQUATIONS_SET%INDEPENDENT% &
@@ -10167,6 +10703,7 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
               NUMBER_OF_FLUID_COMPONENTS=0
               SELECT CASE(EQUATIONS_SET_SUBTYPE)
               CASE(EQUATIONS_SET_MOONEY_RIVLIN_SUBTYPE,EQUATIONS_SET_NO_SUBTYPE, &
+                & EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE, &
                 & EQUATIONS_SET_MOONEY_RIVLIN_ACTIVECONTRACTION_SUBTYPE, &
                 & EQUATIONS_SET_INCOMPRESSIBLE_FINITE_ELASTICITY_DARCY_SUBTYPE, &
                 & EQUATIONS_SET_STANDARD_MONODOMAIN_ELASTICITY_SUBTYPE, &
@@ -10225,6 +10762,8 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
                 NUMBER_OF_COMPONENTS=3;
               CASE(EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
                 & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
+                & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+                & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
                 & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
                 & EQUATIONS_SET_TRANSVERSE_ISOTROPIC_HUMPHREY_YIN_SUBTYPE)
                 NUMBER_OF_COMPONENTS=4;
@@ -10651,7 +11190,8 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
                   VARIABLE_TYPES(varIdx)=EQUATIONS_SET%derived%variableTypes(derivedIdx)
                 END IF
               END DO
-              numberOfTensorComponents=NUMBER_OF_VOIGT(numberOfDimensions)
+              numberOfSymmetricTensorComponents=NUMBER_OF_VOIGT(numberOfDimensions)
+              numberOfFullTensorComponents=numberOfDimensions*numberOfDimensions
               IF(EQUATIONS_SET%derived%derivedFieldAutoCreated) THEN
                 CALL FIELD_NUMBER_OF_VARIABLES_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField, &
                   & EQUATIONS_SET%derived%numberOfVariables,err,error,*999)
@@ -10667,31 +11207,49 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
                         & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                       CALL FIELD_VARIABLE_LABEL_SET(EQUATIONS_SET%derived%derivedField,variableType,"Strain",err,error,*999)
                       CALL FIELD_NUMBER_OF_COMPONENTS_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
-                        & numberOfTensorComponents,err,error,*999)
+                        & numberOfFullTensorComponents,err,error,*999)
+                    CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_SPATIAL)
+                      CALL FIELD_DIMENSION_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
+                        & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
+                      CALL FIELD_VARIABLE_LABEL_SET(EQUATIONS_SET%derived%derivedField,variableType,"Strain",err,error,*999)
+                      CALL FIELD_NUMBER_OF_COMPONENTS_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
+                        & numberOfFullTensorComponents,err,error,*999)
+                    CASE(EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_FIBRE)
+                      CALL FIELD_DIMENSION_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
+                        & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
+                      CALL FIELD_VARIABLE_LABEL_SET(EQUATIONS_SET%derived%derivedField,variableType,"Strain",err,error,*999)
+                      CALL FIELD_NUMBER_OF_COMPONENTS_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
+                        & numberOfFullTensorComponents,err,error,*999)                        
                     CASE(EQUATIONS_SET_R_CAUCHY_GREEN_DEFORMATION_TENSOR)
                       CALL FIELD_DIMENSION_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
                         & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                       CALL FIELD_VARIABLE_LABEL_SET(EQUATIONS_SET%derived%derivedField,variableType,"Strain",err,error,*999)
                       CALL FIELD_NUMBER_OF_COMPONENTS_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
-                        & numberOfTensorComponents,err,error,*999)
+                        & numberOfSymmetricTensorComponents,err,error,*999)
                     CASE(EQUATIONS_SET_L_CAUCHY_GREEN_DEFORMATION_TENSOR)
                       CALL FIELD_DIMENSION_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
                         & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                       CALL FIELD_VARIABLE_LABEL_SET(EQUATIONS_SET%derived%derivedField,variableType,"Strain",err,error,*999)
                       CALL FIELD_NUMBER_OF_COMPONENTS_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
-                        & numberOfTensorComponents,err,error,*999)
+                        & numberOfSymmetricTensorComponents,err,error,*999)
                     CASE(EQUATIONS_SET_GREEN_LAGRANGE_STRAIN_TENSOR)
                       CALL FIELD_DIMENSION_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
                         & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                       CALL FIELD_VARIABLE_LABEL_SET(EQUATIONS_SET%derived%derivedField,variableType,"Strain",err,error,*999)
                       CALL FIELD_NUMBER_OF_COMPONENTS_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
-                        & numberOfTensorComponents,err,error,*999)
+                        & numberOfSymmetricTensorComponents,err,error,*999)
                     CASE(EQUATIONS_SET_CAUCHY_STRESS_TENSOR)
                       CALL FIELD_DIMENSION_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
                         & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                       CALL FIELD_VARIABLE_LABEL_SET(EQUATIONS_SET%derived%derivedField,variableType,"Stress",err,error,*999)
                       CALL FIELD_NUMBER_OF_COMPONENTS_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
-                        & numberOfTensorComponents,err,error,*999)
+                        & numberOfSymmetricTensorComponents,err,error,*999)
+                    CASE(EQUATIONS_SET_CAUCHY_STRESS_TENSOR_FIBRE)
+                      CALL FIELD_DIMENSION_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
+                        & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
+                      CALL FIELD_VARIABLE_LABEL_SET(EQUATIONS_SET%derived%derivedField,variableType,"Stress",err,error,*999)
+                      CALL FIELD_NUMBER_OF_COMPONENTS_SET_AND_LOCK(EQUATIONS_SET%derived%derivedField,variableType, &
+                          & numberOfSymmetricTensorComponents,err,error,*999)
                     CASE(EQUATIONS_SET_FIRST_PK_STRESS_TENSOR)
                       CALL FlagError("Not implemented.",err,error,*999)
                     CASE(EQUATIONS_SET_SECOND_PK_STRESS_TENSOR)
@@ -10718,27 +11276,27 @@ SUBROUTINE FINITE_ELASTICITY_EQUATIONS_SET_SETUP(EQUATIONS_SET,EQUATIONS_SET_SET
                       CALL FIELD_DIMENSION_CHECK(EQUATIONS_SET%derived%derivedField,variableType, &
                         & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                       CALL FIELD_NUMBER_OF_COMPONENTS_CHECK(EQUATIONS_SET%derived%derivedField,variableType, &
-                        & numberOfTensorComponents,err,error,*999)
+                        & numberOfFullTensorComponents,err,error,*999)
                     CASE(EQUATIONS_SET_R_CAUCHY_GREEN_DEFORMATION_TENSOR)
                       CALL FIELD_DIMENSION_CHECK(EQUATIONS_SET%derived%derivedField,variableType, &
                         & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                       CALL FIELD_NUMBER_OF_COMPONENTS_CHECK(EQUATIONS_SET%derived%derivedField,variableType, &
-                        & numberOfTensorComponents,err,error,*999)
+                        & numberOfSymmetricTensorComponents,err,error,*999)
                     CASE(EQUATIONS_SET_L_CAUCHY_GREEN_DEFORMATION_TENSOR)
                       CALL FIELD_DIMENSION_CHECK(EQUATIONS_SET%derived%derivedField,variableType, &
                         & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                       CALL FIELD_NUMBER_OF_COMPONENTS_CHECK(EQUATIONS_SET%derived%derivedField,variableType, &
-                        & numberOfTensorComponents,err,error,*999)
+                        & numberOfSymmetricTensorComponents,err,error,*999)
                     CASE(EQUATIONS_SET_GREEN_LAGRANGE_STRAIN_TENSOR)
                       CALL FIELD_DIMENSION_CHECK(EQUATIONS_SET%derived%derivedField,variableType, &
                         & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                       CALL FIELD_NUMBER_OF_COMPONENTS_CHECK(EQUATIONS_SET%derived%derivedField,variableType, &
-                        & numberOfTensorComponents,err,error,*999)
+                        & numberOfSymmetricTensorComponents,err,error,*999)
                     CASE(EQUATIONS_SET_CAUCHY_STRESS_TENSOR)
                       CALL FIELD_DIMENSION_CHECK(EQUATIONS_SET%derived%derivedField,variableType, &
                         & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                       CALL FIELD_NUMBER_OF_COMPONENTS_CHECK(EQUATIONS_SET%derived%derivedField,variableType, &
-                        & numberOfTensorComponents,err,error,*999)
+                        & numberOfSymmetricTensorComponents,err,error,*999)
                     CASE(EQUATIONS_SET_FIRST_PK_STRESS_TENSOR)
                       CALL FlagError("Not implemented.",err,error,*999)
                     CASE(EQUATIONS_SET_SECOND_PK_STRESS_TENSOR)
@@ -10820,6 +11378,7 @@ SUBROUTINE FiniteElasticity_EquationsSetSolutionMethodSet(EQUATIONS_SET,SOLUTION
           & EQUATIONS_SET_INCOMPRESSIBLE_ELASTICITY_DRIVEN_DARCY_SUBTYPE, &
           & EQUATIONS_SET_INCOMPRESSIBLE_ELAST_MULTI_COMP_DARCY_SUBTYPE,EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
           & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
+          & EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE, &
           & EQUATIONS_SET_CONSTITUTIVE_LAW_IN_CELLML_EVALUATE_SUBTYPE, &
           & EQUATIONS_SET_CONSTITUTIVE_AND_GROWTH_LAW_IN_CELLML_SUBTYPE, &
           & EQUATIONS_SET_GROWTH_LAW_IN_CELLML_SUBTYPE, &
@@ -10837,6 +11396,8 @@ SUBROUTINE FiniteElasticity_EquationsSetSolutionMethodSet(EQUATIONS_SET,SOLUTION
           & EQUATIONS_SET_MULTISCALE_ACTIVE_STRAIN_SUBTYPE, &
           & EQUATIONS_SET_1D3D_MONODOMAIN_ACTIVE_STRAIN_SUBTYPE, &
           & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
+          & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+          & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
           & EQUATIONS_SET_RATE_BASED_SMOOTH_MODEL_SUBTYPE,EQUATIONS_SET_COMPRESSIBLE_RATE_BASED_SMOOTH_MODEL_SUBTYPE, &
           & EQUATIONS_SET_RATE_BASED_GROWTH_MODEL_SUBTYPE,EQUATIONS_SET_COMPRESSIBLE_RATE_BASED_GROWTH_MODEL_SUBTYPE)
         SELECT CASE(SOLUTION_METHOD)
@@ -10913,7 +11474,11 @@ SUBROUTINE FiniteElasticity_EquationsSetSpecificationSet(equationsSet,specificat
           & EQUATIONS_SET_ORTHOTROPIC_MATERIAL_HOLZAPFEL_OGDEN_SUBTYPE, &
           & EQUATIONS_SET_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE,EQUATIONS_SET_NEARLY_INCOMPRESSIBLE_MOONEY_RIVLIN_SUBTYPE, &
           & EQUATIONS_SET_INCOMPRESSIBLE_ELAST_MULTI_COMP_DARCY_SUBTYPE,EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
-          & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
+          & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
+          & EQUATIONS_SET_REFERENCE_STATE_MOONEY_RIVLIN_SUBTYPE, &
+          & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+          & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
+          & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
           & EQUATIONS_SET_CONSTITUTIVE_LAW_IN_CELLML_EVALUATE_SUBTYPE, &
           & EQUATIONS_SET_CONSTITUTIVE_AND_GROWTH_LAW_IN_CELLML_SUBTYPE, &
           & EQUATIONS_SET_GROWTH_LAW_IN_CELLML_SUBTYPE, &
diff --git a/src/fitting_routines.F90 b/src/fitting_routines.F90
index b9650c12..b73e13f6 100644
--- a/src/fitting_routines.F90
+++ b/src/fitting_routines.F90
@@ -26,7 +26,7 @@
 !> Auckland, the University of Oxford and King's College, London.
 !> All Rights Reserved.
 !>
-!> Contributor(s): Chris Bradley
+!> Contributor(s): Chris Bradley,Sebastian Krittian
 !>
 !> Alternatively, the contents of this file may be used under the terms of
 !> either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -119,7 +119,7 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
     INTEGER(INTG) :: ng,mh,mhs,ms,nh,nhs,ns,mi,ni
     INTEGER(INTG) :: dependentComponentColumnIdx,dependentComponentRowIdx,dependentElementParameterColumnIdx, &
       & dependentElementParameterRowIdx,dependentParameterColumnIdx,dependentParameterRowIdx,gaussPointIdx, &
-      & meshComponentRow,meshComponentColumn,numberOfDataComponents
+      & geometricDerivative,meshComponentRow,meshComponentColumn,numberOfDataComponents
     REAL(DP) :: rwg,sum,jacobianGaussWeight
     REAL(DP) :: basisFunctionRow,basisFunctionColumn,PGM,PGN,PGMSI(3),PGNSI(3)
     REAL(DP) :: uValue(3)
@@ -145,22 +145,21 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
     TYPE(QUADRATURE_SCHEME_TYPE), POINTER :: quadratureScheme,quadratureSchemeColumn,quadratureSchemeRow
     TYPE(VARYING_STRING) :: localError
 
-    REAL(DP), POINTER :: independentVectorParameters(:),independentWeightParameters(:)
-    REAL(DP) :: projectionXi(3)
-    REAL(DP) :: porosity0, porosity, permOverVisParam0, permOverVisParam,tauParam,kappaParam
-    REAL(DP) :: tension,curvature
-    REAL(DP) :: materialFact
-    REAL(DP) :: dXdY(3,3), dXdXi(3,3), dYdXi(3,3), dXidY(3,3), dXidX(3,3)
-    REAL(DP) :: Jxy, Jyxi
-    REAL(DP) :: dataPointWeight(99),dataPointVector(99)
     INTEGER(INTG) :: derivative_idx, component_idx, xi_idx, numberOfDimensions,smoothingType
     INTEGER(INTG) :: dataPointIdx,dataPointUserNumber,dataPointLocalNumber,dataPointGlobalNumber
     INTEGER(INTG) :: numberOfXi
     INTEGER(INTG) :: componentIdx
     INTEGER(INTG) :: dependentVariableType,variableType,localDof
-
     INTEGER(INTG) numberDofs
     INTEGER(INTG) meshComponent1,meshComponent2
+    REAL(DP) :: projectionXi(3)
+    REAL(DP) :: porosity0, porosity, permOverVisParam0, permOverVisParam
+    REAL(DP) :: tau1,tau2,tau3,kappa11,kappa22,kappa33,kappa12,kappa13,kappa23,tension,curvature,rhsTension,rhsCurvature
+    REAL(DP) :: materialFact
+    REAL(DP) :: dXdY(3,3), dXdXi(3,3), dYdXi(3,3), dXidY(3,3), dXidX(3,3)
+    REAL(DP) :: Jxy, Jyxi
+    REAL(DP) :: dataPointWeight(99),dataPointVector(99)
+    REAL(DP), POINTER :: independentVectorParameters(:),independentWeightParameters(:)
 
     ENTERS("Fitting_FiniteElementCalculate",err,error,*999)
 
@@ -257,12 +256,12 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
               dataPointGlobalNumber = dataPoints%elementDataPoint(elementNumber)%dataIndices(dataPointIdx)%globalNumber
               ! Need to use global number to get the correct projection results
               projectionXi(1:numberOfXi) = dataProjection%dataProjectionResults(dataPointGlobalNumber)%elementXi(1:numberOfXi)
-              CALL Field_InterpolateXi(FIRST_PART_DERIV,projectionXi,equations%interpolation% &
-                & geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
-              CALL Field_InterpolateXi(FIRST_PART_DERIV,projectionXi,equations%interpolation% &
-                & dependentInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
-              CALL Field_InterpolatedPointMetricsCalculate(geometricBasis%NUMBER_OF_XI,equations%interpolation% &
-                & geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
+              !CALL Field_InterpolateXi(FIRST_PART_DERIV,projectionXi,equations%interpolation% &
+              !  & geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
+              !CALL Field_InterpolateXi(FIRST_PART_DERIV,projectionXi,equations%interpolation% &
+              !  & dependentInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
+              !CALL Field_InterpolatedPointMetricsCalculate(geometricBasis%NUMBER_OF_XI,equations%interpolation% &
+              !  & geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
               !Get data point vector value and weight
               DO componentIdx=1,numberOfDataComponents
                 localDof=dataVariable%components(componentIdx)%PARAM_TO_DOF_MAP% &
@@ -322,15 +321,21 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
             SELECT CASE(smoothingType)
             CASE(EQUATIONS_SET_FITTING_NO_SMOOTHING)
               !Do nothing
-            CASE(EQUATIONS_SET_FITTING_SOBOLEV_VALUE_SMOOTHING)
+            CASE(EQUATIONS_SET_FITTING_SOBOLEV_VALUE_SMOOTHING, &
+              & EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING)
               IF(equationsMatrix%updateMatrix) THEN
                 materialsField=>equations%interpolation%materialsField
                 CALL Field_InterpolationParametersElementGet(FIELD_VALUES_SET_TYPE,elementNumber,equations%interpolation% &
                   & materialsInterpParameters(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
+                IF(smoothingType==EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING) THEN
+                  geometricDerivative=SECOND_PART_DERIV
+                ELSE
+                  geometricDerivative=FIRST_PART_DERIV
+                ENDIF
                 !Loop over Gauss points
                 DO gaussPointIdx=1,quadratureScheme%NUMBER_OF_GAUSS
                   !Interpolate fields
-                  CALL Field_InterpolateGauss(FIRST_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,gaussPointIdx, &
+                  CALL Field_InterpolateGauss(geometricDerivative,BASIS_DEFAULT_QUADRATURE_SCHEME,gaussPointIdx, &
                     & equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
                   CALL Field_InterpolateGauss(SECOND_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,gaussPointIdx, &
                     & equations%interpolation%dependentInterpPoint(dependentVariableType)%ptr,err,error,*999)
@@ -339,8 +344,19 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
                   !Get Sobolev smoothing parameters from interpolated material field
                   CALL Field_InterpolateGauss(NO_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,gaussPointIdx, &
                     & equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
-                  tauParam=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(1,NO_PART_DERIV)
-                  kappaParam=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(2,NO_PART_DERIV)
+                  tau1=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(1,NO_PART_DERIV)
+                  kappa11=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(2,NO_PART_DERIV)
+                  IF(numberOfXi>1) THEN
+                    tau2=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(3,NO_PART_DERIV)
+                    kappa22=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(4,NO_PART_DERIV)
+                    kappa12=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(5,NO_PART_DERIV)
+                    IF(numberOfXi>2) THEN
+                      tau3=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(6,NO_PART_DERIV)
+                      kappa33=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(7,NO_PART_DERIV)
+                      kappa13=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(8,NO_PART_DERIV)
+                      kappa23=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(9,NO_PART_DERIV)
+                    ENDIF
+                  ENDIF
                   jacobianGaussWeight=equations%interpolation%geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr%jacobian* &
                     & quadratureScheme%GAUSS_WEIGHTS(gaussPointIdx)
 
@@ -366,66 +382,98 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
                           dependentParameterColumnIdx=dependentParameterColumnIdx+1
 
                           !Calculate Sobolev surface tension and curvature smoothing terms
-                          tension = tauParam*2.0_DP* ( &
-                            & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1, &
-                            & gaussPointIdx)* &
-                            & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S1, &
-                            & gaussPointIdx))
-                          curvature = kappaParam*2.0_DP* ( &
-                            & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S1, &
-                            & gaussPointIdx)* &
-                            & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S1_S1, &
-                            & gaussPointIdx))
+                          tension = tau1*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1, &
+                            & gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx, &
+                            & PART_DERIV_S1,gaussPointIdx)
+                          curvature = kappa11*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx, &
+                            & PART_DERIV_S1_S1,gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS( &
+                            & dependentElementParameterColumnIdx,PART_DERIV_S1_S1,gaussPointIdx)
                           IF(numberOfXi > 1) THEN
-                            tension = tension + tauParam*2.0_DP* ( &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2, &
-                              & gaussPointIdx)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S2, &
-                              & gaussPointIdx))
-                            curvature = curvature + kappaParam*2.0_DP* ( &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2_S2, &
-                              & gaussPointIdx)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S2_S2, &
-                              & gaussPointIdx) + &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S2, &
-                              & gaussPointIdx)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S1_S2, &
-                              & gaussPointIdx))
+                            tension = tension + tau2*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx, &
+                              & PART_DERIV_S2,gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS( &
+                              & dependentElementParameterColumnIdx,PART_DERIV_S2,gaussPointIdx)
+                            curvature = curvature + kappa22*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx, &
+                              & PART_DERIV_S2_S2,gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS( &
+                              & dependentElementParameterColumnIdx,PART_DERIV_S2_S2,gaussPointIdx) + &
+                              & kappa12*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S2, &
+                              & gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx, &
+                              & PART_DERIV_S1_S2,gaussPointIdx)
                             IF(numberOfXi > 2) THEN
-                              tension = tension + tauParam*2.0_DP* ( &
-                                & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S3, &
-                                & gaussPointIdx)* &
-                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S3, &
-                                & gaussPointIdx))
-                              curvature = curvature + kappaParam*2.0_DP* ( &
-                                & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S3_S3, &
-                                & gaussPointIdx)* &
-                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S3_S3, &
-                                & gaussPointIdx)+ &
-                                & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S3, &
-                                & gaussPointIdx)* &
-                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S1_S3, &
-                                & gaussPointIdx)+ &
-                                & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2_S3, &
-                                & gaussPointIdx)* &
-                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S2_S3, &
-                                & gaussPointIdx))
+                              tension = tension + tau3*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx, &
+                                & PART_DERIV_S3,gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS( &
+                                & dependentElementParameterColumnIdx,PART_DERIV_S3,gaussPointIdx)
+                              curvature = curvature + kappa33*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,&
+                                & PART_DERIV_S3_S3,gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS( &
+                                & dependentElementParameterColumnIdx,PART_DERIV_S3_S3,gaussPointIdx)+ &
+                                & kappa13*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S3, &
+                                & gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx, &
+                                & PART_DERIV_S1_S3,gaussPointIdx)+ &
+                                & kappa23*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2_S3, &
+                                & gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx, &
+                                & PART_DERIV_S2_S3,gaussPointIdx)
                             ENDIF ! 3D
                           ENDIF ! 2 or 3D
-                          sum = (tension + curvature) * jacobianGaussWeight
+                          sum = 2.0_DP*(tension + curvature) * jacobianGaussWeight
 
                           equationsMatrix%elementMatrix%matrix(dependentParameterRowIdx,dependentParameterColumnIdx)= &
                             equationsMatrix%elementMatrix%matrix(dependentParameterRowIdx,dependentParameterColumnIdx)+sum
 
                         ENDDO !dependentElementParameterColumnIdx
                       ENDDO !dependentComponentColumnIdx
+                      IF(smoothingType==EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING) THEN
+                        IF(rhsVector%updateVector) THEN
+                          !Calculate Sobolev surface tension and curvature smoothing terms
+                          rhsTension=0.0_DP
+                          rhsCurvature=0.0_DP
+                          DO dependentComponentColumnIdx=1,dependentVariable%NUMBER_OF_COMPONENTS                          
+                            rhsTension = rhsTension+ &
+                              & tau1*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1, &
+                              & gaussPointIdx)*equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr% &
+                              & values(dependentComponentColumnIdx,PART_DERIV_S1)
+                            rhsCurvature = rhsCurvature + &
+                              & kappa11*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S1, &
+                              & gaussPointIdx)*equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr% &
+                              & values(dependentComponentColumnIdx,PART_DERIV_S1_S1)
+                            IF(numberOfXi > 1) THEN
+                              rhsTension = rhsTension + &
+                                & tau2*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2, &
+                                & gaussPointIdx)*equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr% &
+                                & values(dependentComponentColumnIdx,PART_DERIV_S2)
+                              rhsCurvature = rhsCurvature + &
+                                & kappa22*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2_S2, &
+                                & gaussPointIdx)*equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr% &
+                                & values(dependentComponentColumnIdx,PART_DERIV_S2_S2) + &
+                                & kappa12*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S2, &
+                                & gaussPointIdx)*equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr% &
+                                & values(dependentComponentColumnIdx,PART_DERIV_S1_S2) 
+                              IF(numberOfXi > 2) THEN
+                                rhsTension = rhsTension + &
+                                  & tau3*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S3, &
+                                  & gaussPointIdx)*equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr% &
+                                  & values(dependentComponentColumnIdx,PART_DERIV_S3) 
+                                rhsCurvature = rhsCurvature + &
+                                  & kappa33*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S3_S3, &
+                                  & gaussPointIdx)*equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr% &
+                                  & values(dependentComponentColumnIdx,PART_DERIV_S3_S3) + &
+                                  & kappa13*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S3, &
+                                  & gaussPointIdx)*equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr% &
+                                  & values(dependentComponentColumnIdx,PART_DERIV_S1_S3) + &
+                                  & kappa23*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2_S3, &
+                                  & gaussPointIdx)*equations%interpolation%geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr% &
+                                  & values(dependentComponentColumnIdx,PART_DERIV_S2_S3)
+                              ENDIF ! 3D
+                            ENDIF ! 2 or 3D
+                          ENDDO !dependentComponentColumnIdx
+                          sum = 2.0_DP*(rhsTension + rhsCurvature) * jacobianGaussWeight
+                          rhsVector%elementVector%vector(dependentParameterRowIdx)= &
+                            & rhsVector%elementVector%vector(dependentParameterRowIdx)+sum
+                        ENDIF
+                      ENDIF                      
                     ENDDO !dependentElementParameterRowIdx
                   ENDDO !dependentComponentRowIdx
                 ENDDO !gaussPointIdx
               ENDIF
 
-            CASE(EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING)
-              CALL FlagError("Not implemented.",err,error,*999)
             CASE(EQUATIONS_SET_FITTING_STRAIN_ENERGY_SMOOTHING)
               CALL FlagError("Not implemented.",err,error,*999)
             CASE DEFAULT
@@ -558,89 +606,92 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
             CASE(EQUATIONS_SET_FITTING_NO_SMOOTHING)
               !Do nothing
             CASE(EQUATIONS_SET_FITTING_SOBOLEV_VALUE_SMOOTHING)
-            !===========================================
-            ! S o b o l e v   S m o o t h i n g
-            !===========================================
-            !Loop over gauss points
-            DO ng=1,quadratureScheme%NUMBER_OF_GAUSS
-              CALL Field_InterpolateGauss(SECOND_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,ng,equations%interpolation% &
-                & geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
-              CALL Field_InterpolateGauss(SECOND_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,ng,equations%interpolation% &
-                & dependentInterpPoint(dependentVariableType)%ptr,err,error,*999)
-              CALL Field_InterpolateGauss(NO_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,ng,equations%interpolation% &
-                & materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
-              CALL Field_InterpolatedPointMetricsCalculate(geometricBasis%NUMBER_OF_XI,equations%interpolation% &
-                & geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
-              tauParam=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(1,NO_PART_DERIV)
-              kappaParam=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(2,NO_PART_DERIV)
-              !Loop over field components
-              jacobianGaussWeight=equations%interpolation%geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr%jacobian* &
-                & quadratureScheme%GAUSS_WEIGHTS(ng)
-
-              mhs=0
-              DO mh=1,dependentVariable%NUMBER_OF_COMPONENTS
-                !Loop over element rows
-                meshComponent1=dependentVariable%components(mh)%MESH_COMPONENT_NUMBER
-                dependentBasisRow=>dependentField%decomposition%domain(meshComponent1)%ptr% &
-                  & topology%elements%elements(elementNumber)%basis
-                quadratureSchemeRow=>dependentBasisRow%quadrature%QUADRATURE_SCHEME_MAP(BASIS_DEFAULT_QUADRATURE_SCHEME)%ptr
-                DO ms=1,dependentBasisRow%NUMBER_OF_ELEMENT_PARAMETERS
-                  mhs=mhs+1
-                  nhs=0
-                  IF(equationsMatrix%updateMatrix) THEN
-                    !Loop over element columns
-                    DO nh=1,dependentVariable%NUMBER_OF_COMPONENTS
-                      meshComponent2=dependentVariable%components(nh)%MESH_COMPONENT_NUMBER
-                      dependentBasisColumn=>dependentField%decomposition%domain(meshComponent2)%ptr% &
-                        & topology%elements%elements(elementNumber)%basis
-                      quadratureSchemeColumn=>dependentBasisColumn%quadrature%QUADRATURE_SCHEME_MAP( &
-                        & BASIS_DEFAULT_QUADRATURE_SCHEME)%ptr
-                      DO ns=1,dependentBasisColumn%NUMBER_OF_ELEMENT_PARAMETERS
-                        nhs=nhs+1
-                        sum = 0.0_DP
-
-                        !Calculate sobolev surface tension and curvature smoothing terms
-                        tension = tauParam*2.0_DP* ( &
-                          & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1,ng)* &
-                          & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1,ng))
-                        curvature = kappaParam*2.0_DP* ( &
-                          & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S1,ng)* &
-                          & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S1,ng))
-
-                        IF(dependentVariable%NUMBER_OF_COMPONENTS > 1) THEN
-                          tension = tension + tauParam*2.0_DP* ( &
-                            & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2,ng)* &
-                            & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2,ng))
-                          curvature = curvature + kappaParam*2.0_DP* ( &
-                            & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S2,ng)* &
-                            & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S2,ng) + &
-                            & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S2,ng)* &
-                            & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S2,ng))
-
-                          IF(dependentVariable%NUMBER_OF_COMPONENTS > 2) THEN
-                            tension = tension + tauParam*2.0_DP* ( &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3,ng))
-                            curvature = curvature + kappaParam*2.0_DP* ( &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3_S3,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S3,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S3,ng))
-                          ENDIF ! 3D
-                        ENDIF ! 2 or 3D
-
-                        ! Add in smoothing terms to the element matrix
-                        equationsMatrix%elementMatrix%matrix(mhs,nhs) = &
-                          & equationsMatrix%elementMatrix%matrix(mhs,nhs) + (tension + curvature) * jacobianGaussWeight
+              !===========================================
+              ! S o b o l e v   S m o o t h i n g
+              !===========================================
+              !Loop over gauss points
+              DO ng=1,quadratureScheme%NUMBER_OF_GAUSS
+                CALL Field_InterpolateGauss(SECOND_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,ng,equations%interpolation% &
+                  & geometricInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
+                CALL Field_InterpolateGauss(SECOND_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,ng,equations%interpolation% &
+                  & dependentInterpPoint(dependentVariableType)%ptr,err,error,*999)
+                CALL Field_InterpolateGauss(NO_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,ng,equations%interpolation% &
+                  & materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
+                CALL Field_InterpolatedPointMetricsCalculate(geometricBasis%NUMBER_OF_XI,equations%interpolation% &
+                  & geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
+                tau1=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(1,NO_PART_DERIV)
+                kappa11=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(2,NO_PART_DERIV)
+                IF(numberOfXi>1) THEN
+                  tau2=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(3,NO_PART_DERIV)
+                  kappa22=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(4,NO_PART_DERIV)
+                  kappa12=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(5,NO_PART_DERIV)
+                  IF(numberOfXi>2) THEN
+                    tau3=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(6,NO_PART_DERIV)
+                    kappa33=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(7,NO_PART_DERIV)
+                    kappa13=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(8,NO_PART_DERIV)
+                    kappa23=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(9,NO_PART_DERIV)
+                  ENDIF
+                ENDIF
+                !Loop over field components
+                jacobianGaussWeight=equations%interpolation%geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr%jacobian* &
+                  & quadratureScheme%GAUSS_WEIGHTS(ng)
+                
+                mhs=0
+                DO mh=1,dependentVariable%NUMBER_OF_COMPONENTS
+                  !Loop over element rows
+                  meshComponent1=dependentVariable%components(mh)%MESH_COMPONENT_NUMBER
+                  dependentBasisRow=>dependentField%decomposition%domain(meshComponent1)%ptr% &
+                    & topology%elements%elements(elementNumber)%basis
+                  quadratureSchemeRow=>dependentBasisRow%quadrature%QUADRATURE_SCHEME_MAP(BASIS_DEFAULT_QUADRATURE_SCHEME)%ptr
+                  DO ms=1,dependentBasisRow%NUMBER_OF_ELEMENT_PARAMETERS
+                    mhs=mhs+1
+                    nhs=0
+                    IF(equationsMatrix%updateMatrix) THEN
+                      !Loop over element columns
+                      DO nh=1,dependentVariable%NUMBER_OF_COMPONENTS
+                        meshComponent2=dependentVariable%components(nh)%MESH_COMPONENT_NUMBER
+                        dependentBasisColumn=>dependentField%decomposition%domain(meshComponent2)%ptr% &
+                          & topology%elements%elements(elementNumber)%basis
+                        quadratureSchemeColumn=>dependentBasisColumn%quadrature%QUADRATURE_SCHEME_MAP( &
+                          & BASIS_DEFAULT_QUADRATURE_SCHEME)%ptr
+                        DO ns=1,dependentBasisColumn%NUMBER_OF_ELEMENT_PARAMETERS
+                          nhs=nhs+1
+                          sum = 0.0_DP
+                          
+                          !Calculate Sobolev surface tension and curvature smoothing terms
+                          tension = tau1*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1,ng)* &
+                            & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1,ng)
+                          curvature = kappa11*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S1,ng)* &
+                            & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S1,ng)
+                          IF(numberOfXi > 1) THEN
+                            tension = tension + tau2*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2,ng)* &
+                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2,ng)
+                            curvature = curvature + kappa22*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S2,ng)* &
+                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S2,ng) + &
+                              & kappa12*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S2,ng)* &
+                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S2,ng)
+                            IF(numberOfXi > 2) THEN
+                              tension = tension + tau3*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3,ng)* &
+                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3,ng)
+                              curvature = curvature + kappa33*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3_S3,ng)* &
+                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3_S3,ng)+ &
+                                & kappa13*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S3,ng)* &
+                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S3,ng)+ &
+                                & kappa23*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S3,ng)* &
+                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S3,ng)
+                            ENDIF ! 3D
+                          ENDIF ! 2 or 3D
 
-                      ENDDO !ns
-                    ENDDO !nh
-                  ENDIF ! update matrix
-                ENDDO !ms
-              ENDDO !mh
-            ENDDO !ng
+                          ! Add in smoothing terms to the element matrix
+                          equationsMatrix%elementMatrix%matrix(mhs,nhs) = &
+                            & equationsMatrix%elementMatrix%matrix(mhs,nhs) + (tension + curvature) * jacobianGaussWeight
+                          
+                        ENDDO !ns
+                      ENDDO !nh
+                    ENDIF ! update matrix
+                  ENDDO !ms
+                ENDDO !mh
+              ENDDO !ng
             CASE(EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING)
               CALL FlagError("Not implemented.",err,error,*999)
             CASE(EQUATIONS_SET_FITTING_STRAIN_ENERGY_SMOOTHING)
@@ -843,6 +894,7 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
             dependentVariableType=fieldVariable%VARIABLE_TYPE
             dependentBasis=>dependentField%decomposition%domain(dependentField%decomposition%MESH_COMPONENT_NUMBER)%ptr% &
               & topology%elements%elements(elementNumber)%basis
+            numberOfXi=dependentBasis%NUMBER_OF_XI
             geometricBasis=>geometricField%decomposition%domain(geometricField%decomposition%MESH_COMPONENT_NUMBER)%ptr% &
               & topology%elements%elements(elementNumber)%basis
             sourceBasis=>sourceField%decomposition%domain(sourceField%decomposition%MESH_COMPONENT_NUMBER)%ptr% &
@@ -866,9 +918,20 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
                 & materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
               CALL Field_InterpolatedPointMetricsCalculate(geometricBasis%NUMBER_OF_XI,equations%interpolation% &
                 & geometricInterpPointMetrics(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
-              tauParam=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(1,NO_PART_DERIV)
-              kappaParam=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(2,NO_PART_DERIV)
-              ! WRITE(*,*)'tauParam ',tauParam
+              tau1=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(1,NO_PART_DERIV)
+              kappa11=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(2,NO_PART_DERIV)
+              IF(numberOfXi>1) THEN
+                tau2=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(3,NO_PART_DERIV)
+                kappa22=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(4,NO_PART_DERIV)
+                kappa12=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(5,NO_PART_DERIV)
+                IF(numberOfXi>2) THEN
+                  tau3=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(6,NO_PART_DERIV)
+                  kappa33=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(7,NO_PART_DERIV)
+                  kappa13=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(8,NO_PART_DERIV)
+                  kappa23=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(9,NO_PART_DERIV)
+                ENDIF
+              ENDIF
+             ! WRITE(*,*)'tauParam ',tauParam
               uValue=0.0_DP
               IF(sourceVector%updateVector) THEN
                 CALL Field_InterpolationParametersElementGet(FIELD_VALUES_SET_TYPE,elementNumber, &
@@ -934,29 +997,29 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
                           CASE(EQUATIONS_SET_FITTING_NO_SMOOTHING)
                             !Do nothing
                           CASE(EQUATIONS_SET_FITTING_SOBOLEV_VALUE_SMOOTHING)
-                            sum = sum +    ( &
-                              & tauParam*2.0_DP* ( &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3,ng)) +&
-                              & kappaParam*2.0_DP* ( &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S1,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S1,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S2,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S2,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3_S3,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S2,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S2,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S3,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S3,ng))) !&
-                            ! no weighting either?
-                            !                             & * rwg
+                            tension = tau1*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1,ng)* &
+                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1,ng)
+                            curvature = kappa11*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S1,ng)* &
+                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S1,ng)
+                            IF(numberOfXi > 1) THEN
+                              tension = tension + tau2*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2,ng)* &
+                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2,ng)
+                              curvature = curvature + kappa22*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S2,ng)* &
+                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S2,ng) + &
+                                & kappa12*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S2,ng)* &
+                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S2,ng)
+                              IF(numberOfXi > 2) THEN
+                                tension = tension + tau3*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3,ng)* &
+                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3,ng)
+                                curvature = curvature + kappa33*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3_S3,ng)* &
+                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3_S3,ng)+ &
+                                  & kappa13*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S3,ng)* &
+                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S3,ng)+ &
+                                  & kappa23*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S3,ng)* &
+                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S3,ng)
+                              ENDIF ! 3D
+                            ENDIF ! 2 or 3D
+                            sum = sum + (tension + curvature)*rwg
 
                           CASE(EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING)
                             CALL FlagError("Not implemented.",err,error,*999)
@@ -979,32 +1042,29 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
                           CASE(EQUATIONS_SET_FITTING_NO_SMOOTHING)
                             !Do nothing
                           CASE(EQUATIONS_SET_FITTING_SOBOLEV_VALUE_SMOOTHING)
-                            !REDUCED SOBOLEV SMOOTHING
-                            !This stiffness matrix contribution is with "integration" means ng=ng in fact!
-                            sum = sum +    ( &
-                              & tauParam*2.0_DP* ( &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3,ng)) +&
-                              & kappaParam*2.0_DP* ( &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S1,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S1,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S2,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S2,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3_S3,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S2,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S2,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S3,ng)+ &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S3,ng)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S3,ng))) !&
-                            ! no weighting either?
-                            !                             & * rwg
-
+                           tension = tau1*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1,ng)* &
+                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1,ng)
+                            curvature = kappa11*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S1,ng)* &
+                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S1,ng)
+                            IF(numberOfXi > 1) THEN
+                              tension = tension + tau2*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2,ng)* &
+                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2,ng)
+                              curvature = curvature + kappa22*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S2,ng)* &
+                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S2,ng) + &
+                                & kappa12*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S2,ng)* &
+                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S2,ng)
+                              IF(numberOfXi > 2) THEN
+                                tension = tension + tau3*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3,ng)* &
+                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3,ng)
+                                curvature = curvature + kappa33*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S3_S3,ng)* &
+                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S3_S3,ng)+ &
+                                  & kappa13*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S1_S3,ng)* &
+                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S1_S3,ng)+ &
+                                  & kappa23*quadratureSchemeRow%GAUSS_BASIS_FNS(ms,PART_DERIV_S2_S3,ng)* &
+                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(ns,PART_DERIV_S2_S3,ng)
+                              ENDIF ! 3D
+                            ENDIF ! 2 or 3D
+                            sum = sum + (tension + curvature)*rwg
 
                           CASE(EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING)
                             CALL FlagError("Not implemented.",err,error,*999)
@@ -1144,14 +1204,24 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
               SELECT CASE(smoothingType)
               CASE(EQUATIONS_SET_FITTING_NO_SMOOTHING)
                 !Do nothing
-              CASE(EQUATIONS_SET_FITTING_SOBOLEV_VALUE_SMOOTHING)
+              CASE(EQUATIONS_SET_FITTING_SOBOLEV_VALUE_SMOOTHING, &
+                & EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING)
                 !Get Sobolev smoothing data from interpolated fields
                 CALL Field_InterpolateGauss(NO_PART_DERIV,BASIS_DEFAULT_QUADRATURE_SCHEME,gaussPointIdx, &
                   & equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr,err,error,*999)
-                tauParam=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(1,NO_PART_DERIV)
-                kappaParam=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(2,NO_PART_DERIV)
-              CASE(EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING)
-                CALL FlagError("Not implemented.",err,error,*999)
+                tau1=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(1,NO_PART_DERIV)
+                kappa11=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(2,NO_PART_DERIV)
+                IF(numberOfXi>1) THEN
+                  tau2=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(3,NO_PART_DERIV)
+                  kappa22=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(4,NO_PART_DERIV)
+                  kappa12=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(5,NO_PART_DERIV)
+                  IF(numberOfXi>2) THEN
+                    tau3=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(6,NO_PART_DERIV)
+                    kappa33=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(7,NO_PART_DERIV)
+                    kappa13=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(8,NO_PART_DERIV)
+                    kappa23=equations%interpolation%materialsInterpPoint(FIELD_U_VARIABLE_TYPE)%ptr%values(9,NO_PART_DERIV)
+                  ENDIF
+                ENDIF
               CASE(EQUATIONS_SET_FITTING_STRAIN_ENERGY_SMOOTHING)
                 CALL FlagError("Not implemented.",err,error,*999)
               CASE DEFAULT
@@ -1192,57 +1262,43 @@ SUBROUTINE Fitting_FiniteElementCalculate(equationsSet,elementNumber,err,error,*
                           SELECT CASE(smoothingType)
                           CASE(EQUATIONS_SET_FITTING_NO_SMOOTHING)
                             !Do nothing
-                          CASE(EQUATIONS_SET_FITTING_SOBOLEV_VALUE_SMOOTHING)
+                          CASE(EQUATIONS_SET_FITTING_SOBOLEV_VALUE_SMOOTHING, &
+                            & EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING)
                             !Calculate Sobolev surface tension and curvature smoothing terms
-                            tension = tauParam*2.0_DP* ( &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1, &
-                              & gaussPointIdx)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S1, &
-                              & gaussPointIdx))
-                            curvature = kappaParam*2.0_DP* ( &
-                              & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S1, &
-                              & gaussPointIdx)* &
-                              & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S1_S1, &
-                              & gaussPointIdx))
+                            tension = tau1*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1, &
+                              & gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx, &
+                              & PART_DERIV_S1,gaussPointIdx)
+                            curvature = kappa11*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx, &
+                              & PART_DERIV_S1_S1,gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS( &
+                              & dependentElementParameterColumnIdx,PART_DERIV_S1_S1,gaussPointIdx)
                             IF(numberOfXi > 1) THEN
-                              tension = tension + tauParam*2.0_DP* ( &
-                                & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2, &
-                                & gaussPointIdx)* &
-                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S2, &
-                                & gaussPointIdx))
-                              curvature = curvature + kappaParam*2.0_DP* ( &
-                                & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2_S2, &
-                                & gaussPointIdx)* &
+                              tension = tension + tau2*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx, &
+                                & PART_DERIV_S2,gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS( &
+                                & dependentElementParameterColumnIdx,PART_DERIV_S2,gaussPointIdx)
+                              curvature = curvature + kappa22*quadratureSchemeRow%GAUSS_BASIS_FNS( &
+                                & dependentElementParameterRowIdx,PART_DERIV_S2_S2,gaussPointIdx)* &
                                 & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S2_S2, &
                                 & gaussPointIdx) + &
-                                & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S2, &
-                                & gaussPointIdx)* &
-                                & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S1_S2, &
-                                & gaussPointIdx))
+                                & kappa12*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S2, &
+                                & gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx, &
+                                & PART_DERIV_S1_S2,gaussPointIdx)
                               IF(numberOfXi > 2) THEN
-                                tension = tension + tauParam*2.0_DP* ( &
-                                  & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S3, &
-                                  & gaussPointIdx)* &
-                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S3, &
-                                  & gaussPointIdx))
-                                curvature = curvature + kappaParam*2.0_DP* ( &
-                                  & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S3_S3, &
-                                  & gaussPointIdx)* &
-                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S3_S3, &
-                                  & gaussPointIdx)+ &
-                                  & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S3, &
-                                  & gaussPointIdx)* &
-                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S1_S3, &
-                                  & gaussPointIdx)+ &
-                                  & quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2_S3, &
-                                  & gaussPointIdx)* &
-                                  & quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx,PART_DERIV_S2_S3, &
-                                  & gaussPointIdx))
+                                tension = tension + tau3*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx, &
+                                  & PART_DERIV_S3,gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS( &
+                                  & dependentElementParameterColumnIdx,PART_DERIV_S3,gaussPointIdx)
+                                curvature = curvature + kappa33*quadratureSchemeRow%GAUSS_BASIS_FNS( &
+                                  & dependentElementParameterRowIdx, &
+                                  & PART_DERIV_S3_S3,gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS( &
+                                  & dependentElementParameterColumnIdx,PART_DERIV_S3_S3,gaussPointIdx)+ &
+                                  & kappa13*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S1_S3, &
+                                  & gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx, &
+                                  & PART_DERIV_S1_S3,gaussPointIdx)+ &
+                                  & kappa23*quadratureSchemeRow%GAUSS_BASIS_FNS(dependentElementParameterRowIdx,PART_DERIV_S2_S3, &
+                                  & gaussPointIdx)*quadratureSchemeColumn%GAUSS_BASIS_FNS(dependentElementParameterColumnIdx, &
+                                  & PART_DERIV_S2_S3,gaussPointIdx)
                               ENDIF ! 3D
                             ENDIF ! 2 or 3D
-                            sum = sum + (tension + curvature) * jacobianGaussWeight
-                          CASE(EQUATIONS_SET_FITTING_SOBOLEV_DIFFERENCE_SMOOTHING)
-                            CALL FlagError("Not implemented.",err,error,*999)
+                            sum = (tension + curvature) * jacobianGaussWeight
                           CASE(EQUATIONS_SET_FITTING_STRAIN_ENERGY_SMOOTHING)
                             CALL FlagError("Not implemented.",err,error,*999)
                           CASE DEFAULT
@@ -2192,7 +2248,7 @@ SUBROUTINE Fitting_EquationsSetGaussSetup(equationsSet,equationsSetSetup,err,err
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
     !Local Variables
     INTEGER(INTG) :: componentIdx,geometricMeshComponent,geometricScalingType,numberOfComponents,numberOfComponents2, &
-      & numberOfDependentComponents,numberOfIndependentComponents
+      & numberOfDependentComponents,numberOfIndependentComponents,numberOfMaterialComponents
     TYPE(DECOMPOSITION_TYPE), POINTER :: geometricDecomposition
     TYPE(EquationsType), POINTER :: equations
     TYPE(EquationsMappingVectorType), POINTER :: vectorMapping
@@ -2472,24 +2528,36 @@ SUBROUTINE Fitting_EquationsSetGaussSetup(equationsSet,equationsSetSetup,err,err
                       & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                     CALL Field_DataTypeSetAndLock(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
                       & FIELD_DP_TYPE,err,error,*999)
-                    !Sobolev smoothing material parameters- tau and kappa
+                    !Sobolev smoothing material parameters
+                    SELECT CASE(geometricDecomposition%numberOfDimensions)
+                    CASE(1)
+                      numberOfMaterialComponents=2
+                    CASE(2)
+                      numberOfMaterialComponents=5
+                    CASE(3)
+                      numberOfMaterialComponents=9
+                    CASE DEFAULT
+                      localError="The geometric decomposition number of dimensions of "// &
+                        & TRIM(NumberToVString(geometricDecomposition%numberOfDimensions,"*",err,error))//" is invalid."
+                      CALL FlagError(localError,err,error,*999)
+                    END SELECT
+                    CALL Field_ComponentMeshComponentGet(equationsSet%geometry%GEOMETRIC_FIELD,FIELD_U_VARIABLE_TYPE,1, &
+                      & geometricMeshComponent,err,error,*999)
                     CALL Field_NumberOfComponentsSetAndLock(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                      & 2,err,error,*999)
-                    CALL Field_ComponentMeshComponentGet(equationsSet%geometry%GEOMETRIC_FIELD,FIELD_U_VARIABLE_TYPE, &
-                      & 1,geometricMeshComponent,err,error,*999)
-                    CALL Field_ComponentMeshComponentSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                      & 1,geometricMeshComponent,err,error,*999)
-                    CALL Field_ComponentMeshComponentSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                      & 2,geometricMeshComponent,err,error,*999)
-                    CALL Field_ComponentInterpolationSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                      & 1,FIELD_CONSTANT_INTERPOLATION,err,error,*999)
-                    CALL Field_ComponentInterpolationSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                      & 2,FIELD_CONSTANT_INTERPOLATION,err,error,*999)
+                      & numberOfMaterialComponents,err,error,*999)
+                    DO componentIdx=1,numberOfMaterialComponents
+                      CALL Field_ComponentMeshComponentSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                        & componentIdx,geometricMeshComponent,err,error,*999)
+                      CALL Field_ComponentInterpolationSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                        & componentIdx,FIELD_CONSTANT_INTERPOLATION,err,error,*999)                      
+                    ENDDO !componentIdx
                     !Default the field scaling to that of the geometric field
                     CALL Field_ScalingTypeGet(equationsSet%geometry%GEOMETRIC_FIELD,geometricScalingType,err,error,*999)
                     CALL Field_ScalingTypeSet(equationsMaterials%MATERIALS_FIELD,geometricScalingType,err,error,*999)
                   ELSE
                     !Check the user specified field
+                    CALL Field_MeshDecompositionGet(equationsSet%geometry%GEOMETRIC_FIELD,geometricDecomposition, &
+                      & err,error,*999)
                     CALL Field_TypeCheck(equationsSetSetup%field,FIELD_MATERIAL_TYPE,err,error,*999)
                     CALL Field_DependentTypeCheck(equationsSetSetup%field,FIELD_INDEPENDENT_TYPE,err,error,*999)
                     CALL Field_NumberOfVariablesCheck(equationsSetSetup%field,1,err,error,*999)
@@ -2497,7 +2565,18 @@ SUBROUTINE Fitting_EquationsSetGaussSetup(equationsSet,equationsSetSetup,err,err
                     CALL Field_DimensionCheck(equationsSetSetup%field,FIELD_U_VARIABLE_TYPE,FIELD_VECTOR_DIMENSION_TYPE, &
                       & err,error,*999)
                     CALL Field_DataTypeCheck(equationsSetSetup%field,FIELD_U_VARIABLE_TYPE,FIELD_DP_TYPE,err,error,*999)
-                    CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,2,err,error,*999)
+                    SELECT CASE(geometricDecomposition%numberOfDimensions)
+                    CASE(1)
+                      CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,2,err,error,*999)
+                    CASE(2)
+                      CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,5,err,error,*999)
+                    CASE(3)
+                      CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,9,err,error,*999)
+                    CASE DEFAULT
+                      localError="The geometric decomposition number of dimensions of "// &
+                        & TRIM(NumberToVString(geometricDecomposition%numberOfDimensions,"*",err,error))//" is invalid."
+                      CALL FlagError(localError,err,error,*999)
+                    END SELECT
                   ENDIF
                 ELSE
                   CALL FlagError("Equations set materials is not associated.",err,error,*999)
@@ -2509,10 +2588,24 @@ SUBROUTINE Fitting_EquationsSetGaussSetup(equationsSet,equationsSetSetup,err,err
                     !Finish creating the materials field
                     CALL Field_CreateFinish(equationsMaterials%MATERIALS_FIELD,err,error,*999)
                     !Set the default values for the materials field
-                    CALL Field_ComponentValuesInitialise(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                      & FIELD_VALUES_SET_TYPE,1,0.0_DP,err,error,*999)
-                    CALL Field_ComponentValuesInitialise(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                      & FIELD_VALUES_SET_TYPE,2,0.0_DP,err,error,*999)
+                    CALL Field_MeshDecompositionGet(equationsSet%geometry%GEOMETRIC_FIELD,geometricDecomposition, &
+                      & err,error,*999)
+                    SELECT CASE(geometricDecomposition%numberOfDimensions)
+                    CASE(1)
+                      numberOfMaterialComponents=2
+                    CASE(2)
+                      numberOfMaterialComponents=5
+                    CASE(3)
+                      numberOfMaterialComponents=9
+                    CASE DEFAULT
+                      localError="The geometric decomposition number of dimensions of "// &
+                        & TRIM(NumberToVString(geometricDecomposition%numberOfDimensions,"*",err,error))//" is invalid."
+                      CALL FlagError(localError,err,error,*999)
+                    END SELECT
+                    DO componentIdx=1,numberOfMaterialComponents
+                      CALL Field_ComponentValuesInitialise(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                        & FIELD_VALUES_SET_TYPE,componentIdx,0.0_DP,err,error,*999)
+                    ENDDO !componentIdx
                   ENDIF
                 ELSE
                   CALL FlagError("Equations set materials is not associated.",err,error,*999)
@@ -2787,7 +2880,7 @@ SUBROUTINE Fitting_EquationsSetDataSetup(equationsSet,equationsSetSetup,err,erro
     TYPE(VARYING_STRING), INTENT(OUT) :: error !<The error string
     !Local Variables
     INTEGER(INTG) :: componentIdx,geometricMeshComponent,geometricScalingType,numberOfComponents,numberOfComponents2, &
-      & numberOfDependentComponents,numberOfIndependentComponents
+      & numberOfDependentComponents,numberOfIndependentComponents,numberOfMaterialComponents
     TYPE(DECOMPOSITION_TYPE), POINTER :: geometricDecomposition
     TYPE(EquationsType), POINTER :: equations
     TYPE(EquationsMappingVectorType), POINTER :: vectorMapping
@@ -2923,8 +3016,8 @@ SUBROUTINE Fitting_EquationsSetDataSetup(equationsSet,equationsSetSetup,err,erro
               CALL Field_NumberOfVariablesCheck(equationsSetSetup%field,2,err,error,*999)
               CALL Field_VariableTypesCheck(equationsSetSetup%field,[FIELD_U_VARIABLE_TYPE,FIELD_DELUDELN_VARIABLE_TYPE], &
                 & err,error,*999)
-              CALL Field_DimensionCheck(equationsSetSetup%field,FIELD_U_VARIABLE_TYPE,FIELD_SCALAR_DIMENSION_TYPE,err,error,*999)
-              CALL Field_DimensionCheck(equationsSetSetup%field,FIELD_DELUDELN_VARIABLE_TYPE,FIELD_SCALAR_DIMENSION_TYPE, &
+              CALL Field_DimensionCheck(equationsSetSetup%field,FIELD_U_VARIABLE_TYPE,FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
+              CALL Field_DimensionCheck(equationsSetSetup%field,FIELD_DELUDELN_VARIABLE_TYPE,FIELD_VECTOR_DIMENSION_TYPE, &
                 & err,error,*999)
               CALL Field_DataTypeCheck(equationsSetSetup%field,FIELD_U_VARIABLE_TYPE,FIELD_DP_TYPE,err,error,*999)
               CALL Field_DataTypeCheck(equationsSetSetup%field,FIELD_DELUDELN_VARIABLE_TYPE,FIELD_DP_TYPE,err,error,*999)
@@ -3055,24 +3148,36 @@ SUBROUTINE Fitting_EquationsSetDataSetup(equationsSet,equationsSetSetup,err,erro
                     & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                   CALL Field_DataTypeSetAndLock(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
                     & FIELD_DP_TYPE,err,error,*999)
-                  !Sobolev smoothing material parameters- tau and kappa
+                  !Sobolev smoothing material parameters
+                  SELECT CASE(geometricDecomposition%numberOfDimensions)
+                  CASE(1)
+                    numberOfMaterialComponents=2
+                  CASE(2)
+                    numberOfMaterialComponents=5
+                  CASE(3)
+                    numberOfMaterialComponents=9
+                  CASE DEFAULT
+                    localError="The geometric decomposition number of dimensions of "// &
+                      & TRIM(NumberToVString(geometricDecomposition%numberOfDimensions,"*",err,error))//" is invalid."
+                    CALL FlagError(localError,err,error,*999)
+                  END SELECT
+                  CALL Field_ComponentMeshComponentGet(equationsSet%geometry%GEOMETRIC_FIELD,FIELD_U_VARIABLE_TYPE,1, &
+                    & geometricMeshComponent,err,error,*999)
                   CALL Field_NumberOfComponentsSetAndLock(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                    & 2,err,error,*999)
-                  CALL Field_ComponentMeshComponentGet(equationsSet%geometry%GEOMETRIC_FIELD,FIELD_U_VARIABLE_TYPE, &
-                    & 1,geometricMeshComponent,err,error,*999)
-                  CALL Field_ComponentMeshComponentSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                    & 1,geometricMeshComponent,err,error,*999)
-                  CALL Field_ComponentMeshComponentSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                    & 2,geometricMeshComponent,err,error,*999)
-                  CALL Field_ComponentInterpolationSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                    & 1,FIELD_CONSTANT_INTERPOLATION,err,error,*999)
-                  CALL Field_ComponentInterpolationSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                    & 2,FIELD_CONSTANT_INTERPOLATION,err,error,*999)
+                    & numberOfMaterialComponents,err,error,*999)
+                  DO componentIdx=1,numberOfMaterialComponents
+                    CALL Field_ComponentMeshComponentSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                      & componentIdx,geometricMeshComponent,err,error,*999)
+                    CALL Field_ComponentInterpolationSet(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                      & componentIdx,FIELD_CONSTANT_INTERPOLATION,err,error,*999)                      
+                  ENDDO !componentIdx
                   !Default the field scaling to that of the geometric field
                   CALL Field_ScalingTypeGet(equationsSet%geometry%GEOMETRIC_FIELD,geometricScalingType,err,error,*999)
                   CALL Field_ScalingTypeSet(equationsMaterials%MATERIALS_FIELD,geometricScalingType,err,error,*999)
                 ELSE
                   !Check the user specified field
+                  CALL Field_MeshDecompositionGet(equationsSet%geometry%GEOMETRIC_FIELD,geometricDecomposition, &
+                    & err,error,*999)
                   CALL Field_TypeCheck(equationsSetSetup%field,FIELD_MATERIAL_TYPE,err,error,*999)
                   CALL Field_DependentTypeCheck(equationsSetSetup%field,FIELD_INDEPENDENT_TYPE,err,error,*999)
                   CALL Field_NumberOfVariablesCheck(equationsSetSetup%field,1,err,error,*999)
@@ -3080,7 +3185,18 @@ SUBROUTINE Fitting_EquationsSetDataSetup(equationsSet,equationsSetSetup,err,erro
                   CALL Field_DimensionCheck(equationsSetSetup%field,FIELD_U_VARIABLE_TYPE,FIELD_VECTOR_DIMENSION_TYPE, &
                     & err,error,*999)
                   CALL Field_DataTypeCheck(equationsSetSetup%field,FIELD_U_VARIABLE_TYPE,FIELD_DP_TYPE,err,error,*999)
-                  CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,2,err,error,*999)
+                  SELECT CASE(geometricDecomposition%numberOfDimensions)
+                  CASE(1)
+                    CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,2,err,error,*999)
+                  CASE(2)
+                    CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,5,err,error,*999)
+                  CASE(3)
+                    CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,9,err,error,*999)
+                  CASE DEFAULT
+                    localError="The geometric decomposition number of dimensions of "// &
+                      & TRIM(NumberToVString(geometricDecomposition%numberOfDimensions,"*",err,error))//" is invalid."
+                    CALL FlagError(localError,err,error,*999)
+                  END SELECT
                 ENDIF
               ELSE
                 CALL FlagError("Equations set materials is not associated.",err,error,*999)
@@ -3092,10 +3208,24 @@ SUBROUTINE Fitting_EquationsSetDataSetup(equationsSet,equationsSetSetup,err,erro
                   !Finish creating the materials field
                   CALL Field_CreateFinish(equationsMaterials%MATERIALS_FIELD,err,error,*999)
                   !Set the default values for the materials field
-                  CALL Field_ComponentValuesInitialise(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                    & FIELD_VALUES_SET_TYPE,1,0.0_DP,err,error,*999)
-                  CALL Field_ComponentValuesInitialise(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                    & FIELD_VALUES_SET_TYPE,2,0.0_DP,err,error,*999)
+                  CALL Field_MeshDecompositionGet(equationsSet%geometry%GEOMETRIC_FIELD,geometricDecomposition, &
+                    & err,error,*999)
+                  SELECT CASE(geometricDecomposition%numberOfDimensions)
+                  CASE(1)
+                    numberOfMaterialComponents=2
+                  CASE(2)
+                    numberOfMaterialComponents=5
+                  CASE(3)
+                    numberOfMaterialComponents=9
+                  CASE DEFAULT
+                    localError="The geometric decomposition number of dimensions of "// &
+                      & TRIM(NumberToVString(geometricDecomposition%numberOfDimensions,"*",err,error))//" is invalid."
+                    CALL FlagError(localError,err,error,*999)
+                  END SELECT
+                  DO componentIdx=1,numberOfMaterialComponents
+                    CALL Field_ComponentValuesInitialise(equationsMaterials%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                      & FIELD_VALUES_SET_TYPE,componentIdx,0.0_DP,err,error,*999)
+                  ENDDO !componentIdx
                 ENDIF
               ELSE
                 CALL FlagError("Equations set materials is not associated.",err,error,*999)
@@ -3227,9 +3357,9 @@ SUBROUTINE Fitting_EquationsSetDataSetup(equationsSet,equationsSetSetup,err,erro
                 CASE(EQUATIONS_SET_FEM_SOLUTION_METHOD)
                   DO componentIdx=1,numberOfComponents
                     CALL Field_ComponentInterpolationCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,componentIdx, &
-                      & FIELD_GAUSS_POINT_BASED_INTERPOLATION,err,error,*999)
+                      & FIELD_DATA_POINT_BASED_INTERPOLATION,err,error,*999)
                     CALL Field_ComponentInterpolationCheck(equationsSetSetup%FIELD,FIELD_V_VARIABLE_TYPE,componentIdx, &
-                      & FIELD_GAUSS_POINT_BASED_INTERPOLATION,err,error,*999)
+                      & FIELD_DATA_POINT_BASED_INTERPOLATION,err,error,*999)
                   ENDDO !componentIdx
                 CASE DEFAULT
                   localError="The solution method of "//TRIM(NumberToVString(equationsSet%SOLUTION_METHOD, &
@@ -3395,7 +3525,7 @@ SUBROUTINE FITTING_EQUATIONS_SET_VECTORDATA_SETUP(equationsSet,equationsSetSetup
     INTEGER(INTG) :: GEOMETRIC_MESH_COMPONENT,geometricScalingType,GEOMETRIC_COMPONENT_NUMBER
     INTEGER(INTG) :: numberOfDimensions,I !,MATERIAL_FIELD_NUMBER_OF_VARIABLES
     INTEGER(INTG) :: INDEPENDENT_FIELD_NUMBER_OF_COMPONENTS,INDEPENDENT_FIELD_NUMBER_OF_VARIABLES
-    INTEGER(INTG) :: dependentFieldNumberOfVariables
+    INTEGER(INTG) :: dependentFieldNumberOfVariables,componentIdx,numberOfMaterialComponents
     INTEGER(INTG) :: dimensionIdx
     TYPE(BOUNDARY_CONDITIONS_TYPE), POINTER :: BOUNDARY_CONDITIONS
     TYPE(DECOMPOSITION_TYPE), POINTER :: GEOMETRIC_DECOMPOSITION
@@ -3744,23 +3874,36 @@ SUBROUTINE FITTING_EQUATIONS_SET_VECTORDATA_SETUP(equationsSet,equationsSetSetup
                   & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                 CALL Field_DataTypeSetAndLock(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
                   & FIELD_DP_TYPE,err,error,*999)
+                !Sobolev smoothing material parameters
+                SELECT CASE(GEOMETRIC_DECOMPOSITION%numberOfDimensions)
+                CASE(1)
+                  numberOfMaterialComponents=2
+                CASE(2)
+                  numberOfMaterialComponents=5
+                CASE(3)
+                  numberOfMaterialComponents=9
+                CASE DEFAULT
+                  localError="The geometric decomposition number of dimensions of "// &
+                    & TRIM(NumberToVString(GEOMETRIC_DECOMPOSITION%numberOfDimensions,"*",err,error))//" is invalid."
+                  CALL FlagError(localError,err,error,*999)
+                END SELECT
+                CALL Field_ComponentMeshComponentGet(equationsSet%geometry%GEOMETRIC_FIELD,FIELD_U_VARIABLE_TYPE,1, &
+                  & GEOMETRIC_MESH_COMPONENT,err,error,*999)
                 CALL Field_NumberOfComponentsSetAndLock(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 2,err,error,*999)
-                CALL Field_ComponentMeshComponentGet(equationsSet%GEOMETRY%GEOMETRIC_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 1,GEOMETRIC_COMPONENT_NUMBER,err,error,*999)
-                CALL Field_ComponentMeshComponentSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 1,GEOMETRIC_COMPONENT_NUMBER,err,error,*999)
-                CALL Field_ComponentMeshComponentSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 2,GEOMETRIC_COMPONENT_NUMBER,err,error,*999)
-                CALL Field_ComponentInterpolationSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 1,FIELD_NODE_BASED_INTERPOLATION,err,error,*999)
-                CALL Field_ComponentInterpolationSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 2,FIELD_NODE_BASED_INTERPOLATION,err,error,*999)
+                  & numberOfMaterialComponents,err,error,*999)
+                DO componentIdx=1,numberOfMaterialComponents
+                  CALL Field_ComponentMeshComponentSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                    & componentIdx,GEOMETRIC_MESH_COMPONENT,err,error,*999)
+                  CALL Field_ComponentInterpolationSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                    & componentIdx,FIELD_CONSTANT_INTERPOLATION,err,error,*999)                      
+                ENDDO !componentIdx
                 !Default the field scaling to that of the geometric field
                 CALL Field_ScalingTypeGet(equationsSet%GEOMETRY%GEOMETRIC_FIELD,geometricScalingType,err,error,*999)
                 CALL Field_ScalingTypeSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,geometricScalingType,err,error,*999)
               ELSE
                 !Check the user specified field
+                CALL Field_MeshDecompositionGet(equationsSet%geometry%GEOMETRIC_FIELD,GEOMETRIC_DECOMPOSITION, &
+                  & err,error,*999)
                 CALL Field_TypeCheck(equationsSetSetup%FIELD,FIELD_MATERIAL_TYPE,err,error,*999)
                 CALL Field_DependentTypeCheck(equationsSetSetup%FIELD,FIELD_INDEPENDENT_TYPE,err,error,*999)
                 CALL Field_NumberOfVariablesCheck(equationsSetSetup%FIELD,1,err,error,*999)
@@ -3770,7 +3913,18 @@ SUBROUTINE FITTING_EQUATIONS_SET_VECTORDATA_SETUP(equationsSet,equationsSetSetup
                 CALL Field_DataTypeCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,FIELD_DP_TYPE,err,error,*999)
                 CALL Field_NumberOfComponentsGet(equationsSet%GEOMETRY%GEOMETRIC_FIELD,FIELD_U_VARIABLE_TYPE, &
                   & numberOfDimensions,err,error,*999)
-                CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,1,err,error,*999)
+                SELECT CASE(GEOMETRIC_DECOMPOSITION%numberOfDimensions)
+                CASE(1)
+                  CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,2,err,error,*999)
+                CASE(2)
+                  CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,5,err,error,*999)
+                CASE(3)
+                  CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,9,err,error,*999)
+                CASE DEFAULT
+                  localError="The geometric decomposition number of dimensions of "// &
+                    & TRIM(NumberToVString(GEOMETRIC_DECOMPOSITION%numberOfDimensions,"*",err,error))//" is invalid."
+                  CALL FlagError(localError,err,error,*999)
+                END SELECT
               ENDIF
             ELSE
               CALL FlagError("Equations set materials is not associated.",err,error,*999)
@@ -3782,10 +3936,24 @@ SUBROUTINE FITTING_EQUATIONS_SET_VECTORDATA_SETUP(equationsSet,equationsSetSetup
                 !Finish creating the materials field
                 CALL Field_CreateFinish(EQUATIONS_MATERIALS%MATERIALS_FIELD,err,error,*999)
                 !Set the default values for the materials field
-                CALL Field_ComponentValuesInitialise(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & FIELD_VALUES_SET_TYPE,1,0.0_DP,err,error,*999)
-                CALL Field_ComponentValuesInitialise(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & FIELD_VALUES_SET_TYPE,2,0.0_DP,err,error,*999)
+                CALL Field_MeshDecompositionGet(equationsSet%geometry%GEOMETRIC_FIELD,GEOMETRIC_DECOMPOSITION, &
+                  & err,error,*999)
+                SELECT CASE(GEOMETRIC_DECOMPOSITION%numberOfDimensions)
+                CASE(1)
+                  numberOfMaterialComponents=2
+                CASE(2)
+                  numberOfMaterialComponents=5
+                CASE(3)
+                  numberOfMaterialComponents=9
+                CASE DEFAULT
+                  localError="The geometric decomposition number of dimensions of "// &
+                    & TRIM(NumberToVString(GEOMETRIC_DECOMPOSITION%numberOfDimensions,"*",err,error))//" is invalid."
+                  CALL FlagError(localError,err,error,*999)
+                END SELECT
+                DO componentIdx=1,numberOfMaterialComponents
+                  CALL Field_ComponentValuesInitialise(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                    & FIELD_VALUES_SET_TYPE,componentIdx,0.0_DP,err,error,*999)
+                ENDDO !componentIdx
               ENDIF
             ELSE
               CALL FlagError("Equations set materials is not associated.",err,error,*999)
@@ -4283,19 +4451,29 @@ SUBROUTINE FITTING_EQUATIONS_SET_VECTORDATA_SETUP(equationsSet,equationsSetSetup
                   & FIELD_VECTOR_DIMENSION_TYPE,err,error,*999)
                 CALL Field_DataTypeSetAndLock(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
                   & FIELD_DP_TYPE,err,error,*999)
-                ! Sobolev smoothing material parameters- tau and kappa
+                !Sobolev smoothing material parameters
+                SELECT CASE(GEOMETRIC_DECOMPOSITION%numberOfDimensions)
+                CASE(1)
+                  numberOfMaterialComponents=2
+                CASE(2)
+                  numberOfMaterialComponents=5
+                CASE(3)
+                  numberOfMaterialComponents=9
+                CASE DEFAULT
+                  localError="The geometric decomposition number of dimensions of "// &
+                    & TRIM(NumberToVString(GEOMETRIC_DECOMPOSITION%numberOfDimensions,"*",err,error))//" is invalid."
+                  CALL FlagError(localError,err,error,*999)
+                END SELECT
+                CALL Field_ComponentMeshComponentGet(equationsSet%geometry%GEOMETRIC_FIELD,FIELD_U_VARIABLE_TYPE,1, &
+                  & GEOMETRIC_MESH_COMPONENT,err,error,*999)
                 CALL Field_NumberOfComponentsSetAndLock(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 2,err,error,*999)
-                CALL Field_ComponentMeshComponentGet(equationsSet%GEOMETRY%GEOMETRIC_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 1,GEOMETRIC_COMPONENT_NUMBER,err,error,*999)
-                CALL Field_ComponentMeshComponentSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 1,GEOMETRIC_COMPONENT_NUMBER,err,error,*999)
-                CALL Field_ComponentMeshComponentSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 2,GEOMETRIC_COMPONENT_NUMBER,err,error,*999)
-                CALL Field_ComponentInterpolationSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 1,FIELD_CONSTANT_INTERPOLATION,err,error,*999)
-                CALL Field_ComponentInterpolationSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & 2,FIELD_CONSTANT_INTERPOLATION,err,error,*999)
+                  & numberOfMaterialComponents,err,error,*999)
+                DO componentIdx=1,numberOfMaterialComponents
+                  CALL Field_ComponentMeshComponentSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                    & componentIdx,GEOMETRIC_MESH_COMPONENT,err,error,*999)
+                  CALL Field_ComponentInterpolationSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                    & componentIdx,FIELD_CONSTANT_INTERPOLATION,err,error,*999)                      
+                ENDDO !componentIdx
                 !Default the field scaling to that of the geometric field
                 CALL Field_ScalingTypeGet(equationsSet%GEOMETRY%GEOMETRIC_FIELD,geometricScalingType,err,error,*999)
                 CALL Field_ScalingTypeSet(EQUATIONS_MATERIALS%MATERIALS_FIELD,geometricScalingType,err,error,*999)
@@ -4310,7 +4488,18 @@ SUBROUTINE FITTING_EQUATIONS_SET_VECTORDATA_SETUP(equationsSet,equationsSetSetup
                 CALL Field_DataTypeCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,FIELD_DP_TYPE,err,error,*999)
                 CALL Field_NumberOfComponentsGet(equationsSet%GEOMETRY%GEOMETRIC_FIELD,FIELD_U_VARIABLE_TYPE, &
                   & numberOfDimensions,err,error,*999)
-                CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,1,err,error,*999)
+                SELECT CASE(GEOMETRIC_DECOMPOSITION%numberOfDimensions)
+                CASE(1)
+                  CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,2,err,error,*999)
+                CASE(2)
+                  CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,5,err,error,*999)
+                CASE(3)
+                  CALL Field_NumberOfComponentsCheck(equationsSetSetup%FIELD,FIELD_U_VARIABLE_TYPE,9,err,error,*999)
+                CASE DEFAULT
+                  localError="The geometric decomposition number of dimensions of "// &
+                    & TRIM(NumberToVString(GEOMETRIC_DECOMPOSITION%numberOfDimensions,"*",err,error))//" is invalid."
+                  CALL FlagError(localError,err,error,*999)
+                END SELECT
               ENDIF
             ELSE
               CALL FlagError("Equations set materials is not associated.",err,error,*999)
@@ -4322,10 +4511,24 @@ SUBROUTINE FITTING_EQUATIONS_SET_VECTORDATA_SETUP(equationsSet,equationsSetSetup
                 !Finish creating the materials field
                 CALL Field_CreateFinish(EQUATIONS_MATERIALS%MATERIALS_FIELD,err,error,*999)
                 !Set the default values for the materials field
-                CALL Field_ComponentValuesInitialise(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & FIELD_VALUES_SET_TYPE,1,0.0_DP,err,error,*999)
-                CALL Field_ComponentValuesInitialise(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
-                  & FIELD_VALUES_SET_TYPE,2,0.0_DP,err,error,*999)
+                CALL Field_MeshDecompositionGet(equationsSet%geometry%GEOMETRIC_FIELD,GEOMETRIC_DECOMPOSITION, &
+                  & err,error,*999)
+                SELECT CASE(GEOMETRIC_DECOMPOSITION%numberOfDimensions)
+                CASE(1)
+                  numberOfMaterialComponents=2
+                CASE(2)
+                  numberOfMaterialComponents=5
+                CASE(3)
+                  numberOfMaterialComponents=9
+                CASE DEFAULT
+                  localError="The geometric decomposition number of dimensions of "// &
+                    & TRIM(NumberToVString(GEOMETRIC_DECOMPOSITION%numberOfDimensions,"*",err,error))//" is invalid."
+                  CALL FlagError(localError,err,error,*999)
+                END SELECT
+                DO componentIdx=1,numberOfMaterialComponents
+                  CALL Field_ComponentValuesInitialise(EQUATIONS_MATERIALS%MATERIALS_FIELD,FIELD_U_VARIABLE_TYPE, &
+                    & FIELD_VALUES_SET_TYPE,componentIdx,0.0_DP,err,error,*999)
+                ENDDO !componentIdx
               ENDIF
             ELSE
               CALL FlagError("Equations set materials is not associated.",err,error,*999)
diff --git a/src/interface_routines.F90 b/src/interface_routines.F90
index 426c36cc..94e5a7d1 100644
--- a/src/interface_routines.F90
+++ b/src/interface_routines.F90
@@ -2194,7 +2194,7 @@ SUBROUTINE InterfacePointsConnectivity_UpdateFromProjection(InterfacePointsConne
             InterfacePointsConnectivity%pointsConnectivity(dataPointIdx,coupledMeshIndex)%reducedXi(:)= &
               & dataProjectionResult%xi
             InterfacePointsConnectivity%pointsConnectivity(dataPointIdx,coupledMeshIndex)%coupledMeshElementNumber= &
-              & dataProjectionResult%elementNumber
+              & dataProjectionResult%elementLocalNumber
             InterfacePointsConnectivity%pointsConnectivity(dataPointIdx,coupledMeshIndex)%elementLineFaceNumber= &
               & dataProjectionResult%elementLineFaceNumber
           ENDDO !dataPointIdx
diff --git a/src/mesh_routines.F90 b/src/mesh_routines.F90
index 15fbfe48..34232d65 100644
--- a/src/mesh_routines.F90
+++ b/src/mesh_routines.F90
@@ -8567,7 +8567,7 @@ SUBROUTINE MeshTopology_DataPointsCalculateProjection(mesh,dataProjection,err,er
         !Calculate number of projected data points on an element
         DO dataPointIdx=1,dataPoints%numberOfDataPoints
           dataProjectionResult=>dataProjection%dataProjectionResults(dataPointIdx)
-          elementNumber=dataProjectionResult%elementNumber
+          elementNumber=dataProjectionResult%elementGlobalNumber
           exitTag=dataProjectionResult%exitTag
           IF(exitTag/=DATA_PROJECTION_CANCELLED) THEN
             DO elementIdx=1,elements%NUMBER_OF_ELEMENTS
@@ -8593,7 +8593,7 @@ SUBROUTINE MeshTopology_DataPointsCalculateProjection(mesh,dataProjection,err,er
         dataPointsTopology%totalNumberOfProjectedData=0
         DO dataPointIdx=1,dataPoints%numberOfDataPoints 
           dataProjectionResult=>dataProjection%dataProjectionResults(dataPointIdx)
-          elementNumber=dataProjectionResult%elementNumber
+          elementNumber=dataProjectionResult%elementGlobalNumber
           exitTag=dataProjectionResult%exitTag
           IF(exitTag/=DATA_PROJECTION_CANCELLED) THEN
             DO elementIdx=1,elements%NUMBER_OF_ELEMENTS
diff --git a/src/opencmiss_iron.F90 b/src/opencmiss_iron.F90
index 300cf38f..48cf3fa0 100644
--- a/src/opencmiss_iron.F90
+++ b/src/opencmiss_iron.F90
@@ -380,7 +380,7 @@ MODULE OpenCMISS_Iron
 
   PUBLIC cmfe_FieldType,cmfe_Field_Finalise,cmfe_Field_Initialise
 
-  PUBLIC cmfe_FieldsType,cmfe_Fields_Create,cmfe_Fields_Finalise,cmfe_Fields_Initialise
+  PUBLIC cmfe_FieldsType,cmfe_Fields_AddField,cmfe_Fields_Create,cmfe_Fields_Finalise,cmfe_Fields_Initialise
 
   PUBLIC cmfe_GeneratedMeshType,cmfe_GeneratedMesh_Finalise,cmfe_GeneratedMesh_Initialise
 
@@ -1840,6 +1840,7 @@ MODULE OpenCMISS_Iron
   !> \see OpenCMISS::Iron::DataProjection,OpenCMISS
   !>@{
   INTEGER(INTG), PARAMETER :: CMFE_DATA_PROJECTION_CANCELLED = DATA_PROJECTION_CANCELLED !<Data projection has been cancelled. \see OpenCMISS_DataProjectionExitTags,OpenCMISS
+  INTEGER(INTG), PARAMETER :: CMFE_DATA_PROJECTION_USER_SPECIFIED = DATA_PROJECTION_USER_SPECIFIED !<Data projection was user specified. \see OpenCMISS_DataProjectionExitTags,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_DATA_PROJECTION_EXIT_TAG_CONVERGED = DATA_PROJECTION_EXIT_TAG_CONVERGED !<Data projection exited due to it being converged. \see OpenCMISS_DataProjectionExitTags,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_DATA_PROJECTION_EXIT_TAG_BOUNDS = DATA_PROJECTION_EXIT_TAG_BOUNDS !<Data projection exited due to it hitting the bound and continue to travel out of the element. \see OpenCMISS_DataProjectionExitTags,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_DATA_PROJECTION_EXIT_TAG_MAX_ITERATION = DATA_PROJECTION_EXIT_TAG_MAX_ITERATION !<Data projection exited due to it attaining maximum number of iteration specified by user. \see OpenCMISS_DataProjectionExitTags,OpenCMISS
@@ -1892,6 +1893,13 @@ MODULE OpenCMISS_Iron
     MODULE PROCEDURE cmfe_DataProjection_DestroyObj
   END INTERFACE cmfe_DataProjection_Destroy
 
+  !>Evaluate A data point in a field based on data projection
+  INTERFACE cmfe_DataProjection_DataPointFieldEvaluate
+    MODULE PROCEDURE cmfe_DataProjection_DataPointFieldEvaluateRegionNumber
+    MODULE PROCEDURE cmfe_DataProjection_DataPointFieldEvaluateInterfaceNumber
+    MODULE PROCEDURE cmfe_DataProjection_DataPointFieldEvaluateObj
+  END INTERFACE cmfe_DataProjection_DataPointFieldEvaluate
+
   !>Evaluate the data points position in a field based on data projection
   INTERFACE cmfe_DataProjection_DataPointsPositionEvaluate
     MODULE PROCEDURE cmfe_DataProjection_DataPointsPositionEvaluateRegionNumber
@@ -2112,25 +2120,49 @@ MODULE OpenCMISS_Iron
     MODULE PROCEDURE cmfe_DataProjection_ResultDistanceGetObj
   END INTERFACE cmfe_DataProjection_ResultDistanceGet
 
-  !>Returns the projection element number for a data point identified by a given user number.
+  !>Returns the projection element number for a data point.
   INTERFACE cmfe_DataProjection_ResultElementNumberGet
     MODULE PROCEDURE cmfe_DataProjection_ResultElementNumberGetNumber
     MODULE PROCEDURE cmfe_DataProjection_ResultElementNumberGetObj
   END INTERFACE cmfe_DataProjection_ResultElementNumberGet
 
-  !>Returns the projection element face number for a data point identified by a given user number.
+  !>Sets the projection element number for a data point.
+  INTERFACE cmfe_DataProjection_ResultElementNumberSet
+    MODULE PROCEDURE cmfe_DataProjection_ResultElementNumberSetNumber
+    MODULE PROCEDURE cmfe_DataProjection_ResultElementNumberSetObj
+  END INTERFACE cmfe_DataProjection_ResultElementNumberSet
+
+  !>Returns the projection element face number for a data point.
   INTERFACE cmfe_DataProjection_ResultElementFaceNumberGet
     MODULE PROCEDURE cmfe_DataProjection_ResultElementFaceNumberGetNumber
     MODULE PROCEDURE cmfe_DataProjection_ResultElementFaceNumberGetObj
   END INTERFACE cmfe_DataProjection_ResultElementFaceNumberGet
 
-  !>Returns the projection element line number for a data point identified by a given user number.
+  !>Sets the projection element face number for a data point.
+  INTERFACE cmfe_DataProjection_ResultElementFaceNumberSet
+    MODULE PROCEDURE cmfe_DataProjection_ResultElementFaceNumberSetNumber
+    MODULE PROCEDURE cmfe_DataProjection_ResultElementFaceNumberSetObj
+  END INTERFACE cmfe_DataProjection_ResultElementFaceNumberSet
+
+  !>Returns the projection element line number for a data point.
   INTERFACE cmfe_DataProjection_ResultElementLineNumberGet
     MODULE PROCEDURE cmfe_DataProjection_ResultElementLineNumberGetNumber
     MODULE PROCEDURE cmfe_DataProjection_ResultElementLineNumberGetObj
   END INTERFACE cmfe_DataProjection_ResultElementLineNumberGet
 
-  !>Returns the projection exit tag for a data point identified by a given user number.
+  !>Sets the projection element line number for a data point.
+  INTERFACE cmfe_DataProjection_ResultElementLineNumberSet
+    MODULE PROCEDURE cmfe_DataProjection_ResultElementLineNumberSetNumber
+    MODULE PROCEDURE cmfe_DataProjection_ResultElementLineNumberSetObj
+  END INTERFACE cmfe_DataProjection_ResultElementLineNumberSet
+  
+  !>Returns the element xi for a data point identified by a given user number.
+  INTERFACE cmfe_DataProjection_ResultElementXiGet
+    MODULE PROCEDURE cmfe_DataProjection_ResultElementXiGetNumber
+    MODULE PROCEDURE cmfe_DataProjection_ResultElementXiGetObj
+  END INTERFACE cmfe_DataProjection_ResultElementXiGet
+
+  !>Returns the projection exit tag for a data point.
   INTERFACE cmfe_DataProjection_ResultExitTagGet
     MODULE PROCEDURE cmfe_DataProjection_ResultExitTagGetNumber
     MODULE PROCEDURE cmfe_DataProjection_ResultExitTagGetObj
@@ -2155,16 +2187,16 @@ MODULE OpenCMISS_Iron
   END INTERFACE cmfe_DataProjection_ResultRMSErrorGet
 
   !>Returns the projection xi for a data point identified by a given user number.
-  INTERFACE cmfe_DataProjection_ResultXiGet
-    MODULE PROCEDURE cmfe_DataProjection_ResultXiGetNumber
-    MODULE PROCEDURE cmfe_DataProjection_ResultXiGetObj
-  END INTERFACE cmfe_DataProjection_ResultXiGet
+  INTERFACE cmfe_DataProjection_ResultProjectionXiGet
+    MODULE PROCEDURE cmfe_DataProjection_ResultProjectionXiGetNumber
+    MODULE PROCEDURE cmfe_DataProjection_ResultProjectionXiGetObj
+  END INTERFACE cmfe_DataProjection_ResultProjectionXiGet
 
   !>Sets the projection xi for a data point identified by a given user number.
-  INTERFACE cmfe_DataProjection_ResultXiSet
-    MODULE PROCEDURE cmfe_DataProjection_ResultXiSetNumber
-    MODULE PROCEDURE cmfe_DataProjection_ResultXiSetObj
-  END INTERFACE cmfe_DataProjection_ResultXiSet
+  INTERFACE cmfe_DataProjection_ResultProjectionXiSet
+    MODULE PROCEDURE cmfe_DataProjection_ResultProjectionXiSetNumber
+    MODULE PROCEDURE cmfe_DataProjection_ResultProjectionXiSetObj
+  END INTERFACE cmfe_DataProjection_ResultProjectionXiSet
 
   !>Returns the projection vector for a data point identified by a given user number.
   INTERFACE cmfe_DataProjection_ResultProjectionVectorGet
@@ -2175,8 +2207,8 @@ MODULE OpenCMISS_Iron
   PUBLIC CMFE_DATA_PROJECTION_BOUNDARY_LINES_PROJECTION_TYPE,CMFE_DATA_PROJECTION_BOUNDARY_FACES_PROJECTION_TYPE, &
     & CMFE_DATA_PROJECTION_ALL_ELEMENTS_PROJECTION_TYPE
 
-  PUBLIC CMFE_DATA_PROJECTION_CANCELLED,CMFE_DATA_PROJECTION_EXIT_TAG_CONVERGED,CMFE_DATA_PROJECTION_EXIT_TAG_BOUNDS, &
-    & CMFE_DATA_PROJECTION_EXIT_TAG_MAX_ITERATION,CMFE_DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
+  PUBLIC CMFE_DATA_PROJECTION_CANCELLED,CMFE_DATA_PROJECTION_USER_SPECIFIED,CMFE_DATA_PROJECTION_EXIT_TAG_CONVERGED, &
+    & CMFE_DATA_PROJECTION_EXIT_TAG_BOUNDS,CMFE_DATA_PROJECTION_EXIT_TAG_MAX_ITERATION,CMFE_DATA_PROJECTION_EXIT_TAG_NO_ELEMENT
 
   PUBLIC CMFE_DATA_PROJECTION_DISTANCE_GREATER,CMFE_DATA_PROJECTION_DISTANCE_GREATER_EQUAL,CMFE_DATA_PROJECTION_DISTANCE_LESS, &
     & CMFE_DATA_PROJECTION_DISTANCE_LESS_EQUAL
@@ -2187,6 +2219,8 @@ MODULE OpenCMISS_Iron
 
   PUBLIC cmfe_DataProjection_Destroy
 
+  PUBLIC cmfe_DataProjection_DataPointFieldEvaluate
+
   PUBLIC cmfe_DataProjection_DataPointsPositionEvaluate
 
   PUBLIC cmfe_DataProjection_ProjectionCancelByDataPoints
@@ -2227,9 +2261,15 @@ MODULE OpenCMISS_Iron
 
   PUBLIC cmfe_DataProjection_ResultAnalysisOutput
 
-  PUBLIC cmfe_DataProjection_ResultDistanceGet,cmfe_DataProjection_ResultElementNumberGet
+  PUBLIC cmfe_DataProjection_ResultDistanceGet
+
+  PUBLIC cmfe_DataProjection_ResultElementNumberGet,cmfe_DataProjection_ResultElementNumberSet
+
+  PUBLIC cmfe_DataProjection_ResultElementFaceNumberGet,cmfe_DataProjection_ResultElementFaceNumberSet
 
-  PUBLIC cmfe_DataProjection_ResultElementFaceNumberGet,cmfe_DataProjection_ResultElementLineNumberGet
+  PUBLIC cmfe_DataProjection_ResultElementLineNumberGet,cmfe_DataProjection_ResultElementLineNumberSet
+
+  PUBLIC cmfe_DataProjection_ResultElementXiGet
 
   PUBLIC cmfe_DataProjection_ResultExitTagGet
 
@@ -2237,7 +2277,7 @@ MODULE OpenCMISS_Iron
 
   PUBLIC cmfe_DataProjection_ResultRMSErrorGet
 
-  PUBLIC cmfe_DataProjection_ResultXiGet,cmfe_DataProjection_ResultXiSet
+  PUBLIC cmfe_DataProjection_ResultProjectionXiGet,cmfe_DataProjection_ResultProjectionXiSet
 
   PUBLIC cmfe_DataProjection_ResultProjectionVectorGet
 
@@ -2551,6 +2591,10 @@ MODULE OpenCMISS_Iron
     & EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE !< Transverse isotropic Guccione constitutive law for finite elasticity equstions set subtype \see OpenCMISS_EquationsSetSubtypes,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE = &
     & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE !< Transverse isotropic Guccione constitutive law with active contraction subtype \see OpenCMISS_EquationsSetSubtypes,OpenCMISS
+  INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE = &
+    & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE !< Transverse isotropic Guccione constitutive law with active contraction subtype without length dependence \see OpenCMISS_EquationsSetSubtypes,OpenCMISS
+    INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE = &
+      & EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE !< Transverse isotropic Guccione constitutive law with active contraction subtype for benchmark problem \see OpenCMISS_EquationsSetSubtypes,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_INCOMPRESS_FINITE_ELASTICITY_DARCY_SUBTYPE= &
     & EQUATIONS_SET_INCOMPRESSIBLE_FINITE_ELASTICITY_DARCY_SUBTYPE !<Incompressible version for finite elasticity coupled with Darcy equations set subtype \see OpenCMISS_EquationsSetSubtypes,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_ELASTICITY_DARCY_INRIA_MODEL_SUBTYPE= &
@@ -2837,12 +2881,17 @@ MODULE OpenCMISS_Iron
   !> \see OpenCMISS::Iron::EquationsSet,OpenCMISS
   !>@{
   INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DERIVED_DEFORMATION_GRADIENT = EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR !<Green strain tensor field output. \see OpenCMISS_EquationsSetDerivedTensorTypes,OpenCMISS
+  INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DERIVED_DEFORMATION_GRADIENT_SPATIAL = &
+    & EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_SPATIAL !<Deformation gradient tensor field output. \see OpenCMISS_EquationsSetDerivedTensorTypes,OpenCMISS
+  INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DERIVED_DEFORMATION_GRADIENT_FIBRE = &
+    & EQUATIONS_SET_DEFORMATION_GRADIENT_TENSOR_FIBRE !<Deformation gradient tensor field output. \see OpenCMISS_EquationsSetDerivedTensorTypes,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DERIVED_R_CAUCHY_GREEN_DEFORMATION = &
     & EQUATIONS_SET_R_CAUCHY_GREEN_DEFORMATION_TENSOR !<Right Cauchy-Green deformation field \see OpenCMISS_EquationsSetDerivedTensorTypes,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DERIVED_L_CAUCHY_GREEN_DEFORMATION = &
     & EQUATIONS_SET_L_CAUCHY_GREEN_DEFORMATION_TENSOR !<Left Cauchy-Green deformation field \see OpenCMISS_EquationsSetDerivedTensorTypes,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DERIVED_GREEN_LAGRANGE_STRAIN = EQUATIONS_SET_GREEN_LAGRANGE_STRAIN_TENSOR !<Green strain tensor field output. \see OpenCMISS_EquationsSetDerivedTensorTypes,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DERIVED_CAUCHY_STRESS = EQUATIONS_SET_CAUCHY_STRESS_TENSOR !<Cauchy stress tensor field output. \see OpenCMISS_EquationsSetDerivedTensorTypes,OpenCMISS
+  INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DERIVED_CAUCHY_STRESS_FIBRE = EQUATIONS_SET_CAUCHY_STRESS_TENSOR_FIBRE !<Cauchy stress tensor (wrt deformed fibres) field output. \see OpenCMISS_EquationsSetDerivedTensorTypes,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DERIVED_FIRST_PK_STRESS = EQUATIONS_SET_FIRST_PK_STRESS_TENSOR !<1st Piola-Kirchoff stress tensor field output. \see OpenCMISS_EquationsSetDerivedTensorTypes,OpenCMISS
   INTEGER(INTG), PARAMETER :: CMFE_EQUATIONS_SET_DERIVED_SECOND_PK_STRESS = EQUATIONS_SET_SECOND_PK_STRESS_TENSOR !<2nd Piola-Kirchoff stress tensor field output. \see OpenCMISS_EquationsSetDerivedTensorTypes,OpenCMISS
   !>@}
@@ -3096,6 +3145,8 @@ MODULE OpenCMISS_Iron
     & CMFE_EQUATIONS_SET_INCOMPRESSIBLE_ELASTICITY_DRIVEN_MR_SUBTYPE, &
     & CMFE_EQUATIONS_SET_INCOMPRESS_ELAST_MULTI_COMP_DARCY_SUBTYPE,CMFE_EQUATIONS_SET_TRANSVERSE_ISOTROPIC_GUCCIONE_SUBTYPE, &
     & CMFE_EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_SUBTYPE, &
+    & CMFE_EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_NOLENDEP_SUBTYPE, &
+    & CMFE_EQUATIONS_SET_GUCCIONE_ACTIVECONTRACTION_2NDPIOLA_SUBTYPE, &
     & CMFE_EQUATIONS_SET_ACTIVE_STRAIN_SUBTYPE, &
     & CMFE_EQUATIONS_SET_MULTISCALE_ACTIVE_STRAIN_SUBTYPE, &
     & CMFE_EQUATIONS_SET_REFERENCE_STATE_TRANSVERSE_GUCCIONE_SUBTYPE, &
@@ -3196,10 +3247,11 @@ MODULE OpenCMISS_Iron
     & CMFE_EQUATIONS_SET_FV_SOLUTION_METHOD,CMFE_EQUATIONS_SET_GFEM_SOLUTION_METHOD,CMFE_EQUATIONS_SET_GFD_SOLUTION_METHOD, &
     & CMFE_EQUATIONS_SET_GFV_SOLUTION_METHOD
 
-  PUBLIC CMFE_EQUATIONS_SET_DERIVED_DEFORMATION_GRADIENT,CMFE_EQUATIONS_SET_DERIVED_R_CAUCHY_GREEN_DEFORMATION, &
+  PUBLIC CMFE_EQUATIONS_SET_DERIVED_DEFORMATION_GRADIENT,CMFE_EQUATIONS_SET_DERIVED_DEFORMATION_GRADIENT_SPATIAL, &
+    & CMFE_EQUATIONS_SET_DERIVED_DEFORMATION_GRADIENT_FIBRE,CMFE_EQUATIONS_SET_DERIVED_R_CAUCHY_GREEN_DEFORMATION, &
     & CMFE_EQUATIONS_SET_DERIVED_L_CAUCHY_GREEN_DEFORMATION,CMFE_EQUATIONS_SET_DERIVED_GREEN_LAGRANGE_STRAIN, &
-    & CMFE_EQUATIONS_SET_DERIVED_CAUCHY_STRESS,CMFE_EQUATIONS_SET_DERIVED_FIRST_PK_STRESS, &
-    & CMFE_EQUATIONS_SET_DERIVED_SECOND_PK_STRESS
+    & CMFE_EQUATIONS_SET_DERIVED_CAUCHY_STRESS,CMFE_EQUATIONS_SET_DERIVED_CAUCHY_STRESS_FIBRE, &
+    & CMFE_EQUATIONS_SET_DERIVED_FIRST_PK_STRESS, CMFE_EQUATIONS_SET_DERIVED_SECOND_PK_STRESS
  
   PUBLIC CMFE_EQUATIONS_MATRIX_STIFFNESS,CMFE_EQUATIONS_MATRIX_DAMPING,CMFE_EQUATIONS_MATRIX_MASS
 
@@ -8554,6 +8606,32 @@ END SUBROUTINE cmfe_Field_Initialise
   !================================================================================================================================
   !
 
+  !>Creates a cmfe_FieldsType object for an inteface by an object reference.
+  SUBROUTINE cmfe_Fields_AddField(fields,field,err)
+    !DLLEXPORT(cmfe_Fields_CreateInterface)
+
+    !Argument variables
+    TYPE(cmfe_FieldsType), INTENT(INOUT) :: fields !<The fields attached to the specified interface.
+    TYPE(cmfe_FieldType), INTENT(IN) :: field !<The field to add to the fields
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+
+    ENTERS("cmfe_Fields_AddField",err,error,*999)
+
+    CALL Fields_AddField(fields%fields,field%field,err,error,*999)
+
+    EXITS("cmfe_Fields_AddField")
+    RETURN
+999 ERRORSEXITS("cmfe_Fields_AddField",err,error)
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_Fields_AddField
+
+  !
+  !================================================================================================================================
+  !
+
   !>Creates a cmfe_FieldsType object for an inteface by an object reference.
   SUBROUTINE cmfe_Fields_CreateInterface(interface,fields,err)
     !DLLEXPORT(cmfe_Fields_CreateInterface)
@@ -20130,6 +20208,138 @@ END SUBROUTINE cmfe_DataProjection_DestroyObj
   !================================================================================================================================
   !
 
+  !>Evaluate the data point in a field based on data projection in a region, identified by user number
+  SUBROUTINE cmfe_DataProjection_DataPointFieldEvaluateRegionNumber(regionUserNumber,dataPointsUserNumber, &
+    & dataProjectionUserNumber,fieldUserNumber,fieldVariableType,fieldParameterSetType,dataPointUserNumber,fieldResult,err)
+    !DLLEXPORT(cmfe_DataProjection_DataPointFieldEvaluateRegionNumber)
+
+    !Argument variables
+    INTEGER(INTG), INTENT(IN) :: regionUserNumber !<The region user number of the data projection and field
+    INTEGER(INTG), INTENT(IN) :: dataPointsUserNumber !<The user number of the data points on the data projection in the region.
+    INTEGER(INTG), INTENT(IN) :: dataProjectionUserNumber !<The data projection user number of the data projection
+    INTEGER(INTG), INTENT(IN) :: fieldUserNumber !<The field user number of the field to be interpolated
+    INTEGER(INTG), INTENT(IN) :: fieldVariableType !<The field variable type to be interpolated
+    INTEGER(INTG), INTENT(IN) :: fieldParameterSetType !<The field parameter set type to be interpolated
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The data point user number to evaluate the field at
+    REAL(DP), INTENT(OUT) :: fieldResult(:) !<On return, the values of the field evaluated at the data point.
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+    TYPE(DataProjectionType), POINTER :: dataProjection
+    TYPE(DataPointsType), POINTER :: dataPoints
+    TYPE(FIELD_TYPE), POINTER :: field
+    TYPE(REGION_TYPE), POINTER :: region
+
+    ENTERS("cmfe_DataProjection_DataPointFieldEvaluateRegionNumber",err,error,*999)
+
+    NULLIFY(dataProjection)
+    NULLIFY(dataPoints)
+    NULLIFY(field)
+    NULLIFY(region)
+    CALL Region_Get(regionUserNumber,region,err,error,*999)
+    CALL Region_FieldGet(region,fieldUserNumber,field,err,error,*999)
+    CALL Region_DataPointsGet(region,dataPointsUserNumber,dataPoints,err,error,*999)
+    CALL DataPoints_DataProjectionGet(dataPoints,dataProjectionUserNumber,dataProjection,err,error,*999)
+    CALL DataProjection_DataPointFieldEvaluate(dataProjection,field,fieldVariableType,fieldParameterSetType, &
+      & dataPointUserNumber,fieldResult,err,error,*999)
+
+    EXITS("cmfe_DataProjection_DataPointFieldEvaluateRegionNumber")
+    RETURN
+999 ERRORS("cmfe_DataProjection_DataPointFieldEvaluateRegionNumber",err,error)
+    EXITS("cmfe_DataProjection_DataPointFieldEvaluateRegionNumber")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_DataPointFieldEvaluateRegionNumber
+
+  !
+  !================================================================================================================================
+  !
+
+  !>Evaluate the data point in a field based on data projection in an interface, identified by user number
+  SUBROUTINE cmfe_DataProjection_DataPointFieldEvaluateInterfaceNumber(parentRegionUserNumber,interfaceUserNumber, &
+    & dataPointsUserNumber,dataProjectionUserNumber,fieldUserNumber,fieldVariableType,fieldParameterSetType, &
+    & dataPointUserNumber,fieldResult,err)
+    !DLLEXPORT(cmfe_DataProjection_DataPointFieldEvaluateInterfaceNumber)
+
+    !Argument variables
+    INTEGER(INTG), INTENT(IN) :: parentRegionUserNumber !<The parent region number of the interface for the data projection
+    INTEGER(INTG), INTENT(IN) :: interfaceUserNumber !<The interface number for the data projection
+    INTEGER(INTG), INTENT(IN) :: dataPointsUserNumber !<The user number of the data points on the data projection in the interface.
+    INTEGER(INTG), INTENT(IN) :: dataProjectionUserNumber !<The data projection user number of the data projection
+    INTEGER(INTG), INTENT(IN) :: fieldUserNumber !<The field user number of the field to be interpolated
+    INTEGER(INTG), INTENT(IN) :: fieldVariableType !<The field variable type to be interpolated
+    INTEGER(INTG), INTENT(IN) :: fieldParameterSetType !<The field parameter set type to be interpolated
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The data point user number to evaluate the field at
+    REAL(DP), INTENT(OUT) :: fieldResult(:) !<On return, the values of the field evaluated at the data point.
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+    TYPE(DataProjectionType), POINTER :: dataProjection
+    TYPE(DataPointsType), POINTER :: dataPoints
+    TYPE(FIELD_TYPE), POINTER :: field
+    TYPE(REGION_TYPE), POINTER :: parentRegion
+    TYPE(INTERFACE_TYPE), POINTER :: interface
+
+    ENTERS("cmfe_DataProjection_DataPointFieldEvaluateInterfaceNumber",err,error,*999)
+
+    NULLIFY(dataProjection)
+    NULLIFY(dataPoints)
+    NULLIFY(field)
+    NULLIFY(parentRegion)
+    NULLIFY(interface)
+    CALL Region_Get(parentRegionUserNumber,parentRegion,err,error,*999)
+    CALL Region_InterfaceGet(parentRegion,interfaceUserNumber,interface,err,error,*999)
+    CALL Interface_DataPointsGet(interface,dataPointsUserNumber,dataPoints,err,error,*999)
+    CALL DataPoints_DataProjectionGet(dataPoints,dataProjectionUserNumber,dataProjection,err,error,*999)
+    CALL Interface_FieldGet(interface,fieldUserNumber,field,err,error,*999)
+    CALL DataProjection_DataPointFieldEvaluate(dataProjection,field,fieldVariableType,fieldParameterSetType, &
+      & dataPointUserNumber,fieldResult,err,error,*999)
+
+    EXITS("cmfe_DataProjection_DataPointFieldEvaluateInterfaceNumber")
+    RETURN
+999 ERRORS("cmfe_DataProjection_DataPointFieldEvaluateInterfaceNumber",err,error)
+    EXITS("cmfe_DataProjection_DataPointFieldEvaluateInterfaceNumber")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_DataPointFieldEvaluateInterfaceNumber
+
+  !
+  !================================================================================================================================
+  !
+
+  !>Evaluate the data point in a field based on data projection, identified by object
+  SUBROUTINE cmfe_DataProjection_DataPointFieldEvaluateObj(dataProjection,field,fieldVariableType,fieldParameterSetType, &
+    & dataPointUserNumber,fieldResult,err)
+    !DLLEXPORT(cmfe_DataProjection_DataPointFieldEvaluateObj)
+
+    !Argument variables
+    TYPE(cmfe_DataProjectionType), INTENT(INOUT) :: dataProjection !<The data projection used to evaluate data points position
+    TYPE(cmfe_FieldType), INTENT(IN) :: field !<The field to interpolate
+    INTEGER(INTG), INTENT(IN) :: fieldVariableType !<The field variable type to be interpolated
+    INTEGER(INTG), INTENT(IN) :: fieldParameterSetType !<The field parameter set type to be interpolated
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The data point user number to evaluate the field at
+    REAL(DP), INTENT(OUT) :: fieldResult(:) !<On return, the values of the field evaluated at the data point.
+    !Local variables
+
+    ENTERS("cmfe_DataProjection_DataPointFieldEvaluateObj",err,error,*999)
+
+    CALL DataProjection_DataPointFieldEvaluate(dataProjection%dataProjection,field%field,fieldVariableType, &
+      & fieldParameterSetType,dataPointUserNumber,fieldResult,err,error,*999)
+
+    EXITS("cmfe_DataProjection_DataPointFieldEvaluateObj")
+    RETURN
+999 ERRORS("cmfe_DataProjection_DataPointFieldEvaluateObj",err,error)
+    EXITS("cmfe_DataProjection_DataPointFieldEvaluateObj")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_DataPointFieldEvaluateObj
+
+  !
+  !================================================================================================================================
+  !
+
   !>Evaluate the data points position in a field based on data projection in a region, identified by user number
   SUBROUTINE cmfe_DataProjection_DataPointsPositionEvaluateRegionNumber(regionUserNumber,dataPointsUserNumber, &
     & dataProjectionUserNumber,fieldUserNumber,fieldVariableType,fieldParameterSetType,err)
@@ -21167,8 +21377,8 @@ SUBROUTINE cmfe_DataProjection_ProjectionDataCandidateElementsSetObj00(dataProje
 
     ENTERS("cmfe_DataProjection_ProjectionDataCandidateElementsSetObj00",err,error,*999)
 
-    CALL cmfe_DataProjection_ProjectionDataCandidateElementsSetObj11(dataProjection,[dataPointUserNumber], &
-      & [candidateElementUserNumber],err)
+    CALL DataProjection_ProjectionDataCandidateElementsSet(dataProjection%dataProjection,[dataPointUserNumber], &
+      & [candidateElementUserNumber],err,error,*999)
 
     EXITS("cmfe_DataProjection_ProjectionDataCandidateElementsSetObj00")
     RETURN
@@ -21197,8 +21407,8 @@ SUBROUTINE cmfe_DataProjection_ProjectionDataCandidateElementsSetObj01(dataProje
 
     ENTERS("cmfe_DataProjection_ProjectionDataCandidateElementsSetObj01",err,error,*999)
 
-    CALL cmfe_DataProjection_ProjectionDataCandidateElementsSetObj11(dataProjection,[dataPointUserNumber], &
-      & candidateElementUserNumbers,err)
+    CALL DataProjection_ProjectionDataCandidateElementsSet(dataProjection%dataProjection,[dataPointUserNumber], &
+      & candidateElementUserNumbers,err,error,*999)
 
     EXITS("cmfe_DataProjection_ProjectionDataCandidateElementsSetObj01")
     RETURN
@@ -21227,8 +21437,8 @@ SUBROUTINE cmfe_DataProjection_ProjectionDataCandidateElementsSetObj10(dataProje
 
     ENTERS("cmfe_DataProjection_ProjectionDataCandidateElementsSetObj10",err,error,*999)
 
-    CALL cmfe_DataProjection_ProjectionDataCandidateElementsSetObj11(dataProjection,dataPointUserNumbers, &
-      & [candidateElementUserNumber],err)
+    CALL DataProjection_ProjectionDataCandidateElementsSet(dataProjection%dataProjection,dataPointUserNumbers, &
+      & [candidateElementUserNumber],err,error,*999)
 
     EXITS("cmfe_DataProjection_ProjectionDataCandidateElementsSetObj10")
     RETURN
@@ -21257,7 +21467,8 @@ SUBROUTINE cmfe_DataProjection_ProjectionDataCandidateElementsSetObj11(dataProje
 
     ENTERS("cmfe_DataProjection_ProjectionDataCandidateElementsSetObj11",err,error,*999)
 
-    CALL DataProjection_ProjectionCandidateElementsSet(dataProjection%dataProjection,candidateElementUserNumbers,err,error,*999)
+    CALL DataProjection_ProjectionDataCandidateElementsSet(dataProjection%dataProjection,dataPointUserNumbers, &
+      & candidateElementUserNumbers,err,error,*999)
 
     EXITS("cmfe_DataProjection_ProjectionDataCandidateElementsSetObj11")
     RETURN
@@ -22794,6 +23005,75 @@ END SUBROUTINE cmfe_DataProjection_ResultElementNumberGetObj
   !================================================================================================================================
   !
 
+  !>Sets the projection element number for a data point in a set of data points identified by user number.
+  SUBROUTINE cmfe_DataProjection_ResultElementNumberSetNumber(regionUserNumber,dataPointsUserNumber,dataProjectionUserNumber, &
+    & dataPointUserNumber,projectionElementUserNumber,err)
+    !DLLEXPORT(cmfe_DataProjection_ResultElementNumberSetNumber)
+
+    !Argument variables
+    INTEGER(INTG), INTENT(IN) :: regionUserNumber !<The user number of the region containing the data points to get attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointsUserNumber !<The user number of the data points on the data projection in the region.
+    INTEGER(INTG), INTENT(IN) :: dataProjectionUserNumber !<The user number of the data projection containing the data points to get attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The user number of the data points to get attributes for.
+    INTEGER(INTG), INTENT(IN) :: projectionElementUserNumber !<The projection element user number to set for the data point.
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+    TYPE(DataPointsType), POINTER :: dataPoints
+    TYPE(DataProjectionType), POINTER :: dataProjection
+    TYPE(REGION_TYPE), POINTER :: region
+
+    ENTERS("cmfe_DataProjection_ResultElementNumberSetNumber",err,error,*999)
+
+    NULLIFY(region)
+    NULLIFY(dataPoints)
+    NULLIFY(dataProjection)
+    CALL Region_Get(regionUserNumber,region,err,error,*999)
+    CALL Region_DataPointsGet(region,dataPointsUserNumber,dataPoints,err,error,*999)
+    CALL DataPoints_DataProjectionGet(dataPoints,dataProjectionUserNumber,dataProjection,err,error,*999)
+    CALL DataProjection_ResultElementNumberSet(dataProjection,dataPointUserNumber,projectionElementUserNumber,err,error,*999)
+
+    EXITS("cmfe_DataProjection_ResultElementNumberSetNumber")
+    RETURN
+999 ERRORS("cmfe_DataProjection_ResultElementNumberSetNumber",err,error)
+    EXITS("cmfe_DataProjection_ResultElementNumberSetNumber")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_ResultElementNumberSetNumber
+
+  !
+  !================================================================================================================================
+  !
+
+  !>Sets the projection element number for a data point in a set of data points identified by an object.
+  SUBROUTINE cmfe_DataProjection_ResultElementNumberSetObj(dataProjection,dataPointUserNumber,projectionElementUserNumber,err)
+    !DLLEXPORT(cmfe_DataProjection_ResultElementNumberSetObj)
+
+    !Argument variables
+    TYPE(cmfe_DataProjectionType), INTENT(IN) :: dataProjection !<The data projection to get attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The user number of the data points to get attributes for.
+    INTEGER(INTG), INTENT(IN) :: projectionElementUserNumber !<The projection element user number to set for the data point.
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+
+    ENTERS("cmfe_DataProjection_ResultElementNumberSetObj",err,error,*999)
+
+    CALL DataProjection_ResultElementNumberSet(dataProjection%dataProjection,dataPointUserNumber,projectionElementUserNumber, &
+      & err,error,*999)
+
+    EXITS("cmfe_DataProjection_ResultElementNumberSetObj")
+    RETURN
+999 ERRORS("cmfe_DataProjection_ResultElementNumberSetObj",err,error)
+    EXITS("cmfe_DataProjection_ResultElementNumberSetObj")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_ResultElementNumberSetObj
+
+  !
+  !================================================================================================================================
+  !
+
   !>Returns the projection element face number for a data point in a set of data points identified by user number.
   SUBROUTINE cmfe_DataProjection_ResultElementFaceNumberGetNumber(regionUserNumber,dataPointsUserNumber, &
     & dataProjectionUserNumber,dataPointUserNumber,projectionElementFaceNumber,err)
@@ -22865,6 +23145,79 @@ END SUBROUTINE cmfe_DataProjection_ResultElementFaceNumberGetObj
   !================================================================================================================================
   !
 
+  !>Sets the projection element face number for a data point in a set of data points identified by user number.
+  SUBROUTINE cmfe_DataProjection_ResultElementFaceNumberSetNumber(regionUserNumber,dataPointsUserNumber, &
+    & dataProjectionUserNumber,dataPointUserNumber,projectionElementUserNumber,localFaceNormal,err)
+    !DLLEXPORT(cmfe_DataProjection_ResultElementFaceNumberSetNumber)
+
+    !Argument variables
+    INTEGER(INTG), INTENT(IN) :: regionUserNumber !<The user number of the region containing the data points to set attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointsUserNumber !<The user number of the data points on the data projection in the region.
+    INTEGER(INTG), INTENT(IN) :: dataProjectionUserNumber !<The user number of the data projection containing the data points to set attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The user number of the data points to set attributes for.
+    INTEGER(INTG), INTENT(IN) :: projectionElementUserNumber !<The projection element user number to set for the data point.
+    INTEGER(INTG), INTENT(IN) :: localFaceNormal !<The projection candidate element face normal to set the result for
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+    TYPE(DataPointsType), POINTER :: dataPoints
+    TYPE(DataProjectionType), POINTER :: dataProjection
+    TYPE(REGION_TYPE), POINTER :: region
+
+    ENTERS("cmfe_DataProjection_ResultElementFaceNumberSetNumber",err,error,*999)
+
+    NULLIFY(region)
+    NULLIFY(dataPoints)
+    NULLIFY(dataProjection)
+    CALL Region_Get(regionUserNumber,region,err,error,*999)
+    CALL Region_DataPointsGet(region,dataPointsUserNumber,dataPoints,err,error,*999)
+    CALL DataPoints_DataProjectionGet(dataPoints,dataProjectionUserNumber,dataProjection,err,error,*999)
+    CALL DataProjection_ResultElementFaceNumberSet(dataProjection,dataPointUserNumber,projectionElementUserNumber, &
+      & localFaceNormal,err,error,*999)
+
+    EXITS("cmfe_DataProjection_ResultElementFaceNumberSetNumber")
+    RETURN
+999 ERRORS("cmfe_DataProjection_ResultElementFaceNumberSetNumber",err,error)
+    EXITS("cmfe_DataProjection_ResultElementFaceNumberSetNumber")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_ResultElementFaceNumberSetNumber
+
+  !
+  !================================================================================================================================
+  !
+
+  !>Returns the projection element face number for a data point in a set of data points identified by an object.
+  SUBROUTINE cmfe_DataProjection_ResultElementFaceNumberSetObj(dataProjection,dataPointUserNumber, &
+    & projectionElementUserNumber,localFaceNormal,err)
+    !DLLEXPORT(cmfe_DataProjection_ResultElementFaceNumberSetObj)
+
+    !Argument variables
+    TYPE(cmfe_DataProjectionType), INTENT(IN) :: dataProjection !<The data projection to set attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The user number of the data points to set attributes for.
+    INTEGER(INTG), INTENT(IN) :: projectionElementUserNumber !<The projection element user number to set for the data point.
+    INTEGER(INTG), INTENT(IN) :: localFaceNormal !<The projection candidate element face normal to set the result for
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+
+    ENTERS("cmfe_DataProjection_ResultElementFaceNumberSetObj",err,error,*999)
+
+    CALL DataProjection_ResultElementFaceNumberSet(dataProjection%dataProjection,dataPointUserNumber, &
+      & projectionElementUserNumber,localFaceNormal,err,error,*999)
+
+    EXITS("cmfe_DataProjection_ResultElementFaceNumberSetObj")
+    RETURN
+999 ERRORS("cmfe_DataProjection_ResultElementFaceNumberSetObj",err,error)
+    EXITS("cmfe_DataProjection_ResultElementFaceNumberSetObj")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_ResultElementFaceNumberSetObj
+
+  !
+  !================================================================================================================================
+  !
+
   !>Returns the projection element line number for a data point in a set of data points identified by user number.
   SUBROUTINE cmfe_DataProjection_ResultElementLineNumberGetNumber(regionUserNumber,dataPointsUserNumber, &
     & dataProjectionUserNumber,dataPointUserNumber,projectionElementLineNumber,err)
@@ -22936,6 +23289,79 @@ END SUBROUTINE cmfe_DataProjection_ResultElementLineNumberGetObj
   !================================================================================================================================
   !
 
+  !>Sets the projection element line number for a data point in a set of data points identified by user number.
+  SUBROUTINE cmfe_DataProjection_ResultElementLineNumberSetNumber(regionUserNumber,dataPointsUserNumber, &
+    & dataProjectionUserNumber,dataPointUserNumber,projectionElementUserNumber,localLineNormals,err)
+    !DLLEXPORT(cmfe_DataProjection_ResultElementLineNumberSetNumber)
+
+    !Argument variables
+    INTEGER(INTG), INTENT(IN) :: regionUserNumber !<The user number of the region containing the data points to set attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointsUserNumber !<The user number of the data points on the data projection in the region.
+    INTEGER(INTG), INTENT(IN) :: dataProjectionUserNumber !<The user number of the data projection containing the data points to set attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The user number of the data points to set attributes for.
+    INTEGER(INTG), INTENT(IN) :: projectionElementUserNumber !<The projection element user number to set for the data point.
+    INTEGER(INTG), INTENT(IN) :: localLineNormals(:) !<localLineNormals(lineNormalIdx). The local line normals to set for the data point.
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+    TYPE(DataPointsType), POINTER :: dataPoints
+    TYPE(DataProjectionType), POINTER :: dataProjection
+    TYPE(REGION_TYPE), POINTER :: region
+
+    ENTERS("cmfe_DataProjection_ResultElementLineNumberSetNumber",err,error,*999)
+
+    NULLIFY(region)
+    NULLIFY(dataPoints)
+    NULLIFY(dataProjection)
+    CALL Region_Get(regionUserNumber,region,err,error,*999)
+    CALL Region_DataPointsGet(region,dataPointsUserNumber,dataPoints,err,error,*999)
+    CALL DataPoints_DataProjectionGet(dataPoints,dataProjectionUserNumber,dataProjection,err,error,*999)
+    CALL DataProjection_ResultElementLineNumberSet(dataProjection,dataPointUserNumber,projectionElementUserNumber, &
+      & localLineNormals,err,error,*999)
+
+    EXITS("cmfe_DataProjection_ResultElementLineNumberSetNumber")
+    RETURN
+999 ERRORS("cmfe_DataProjection_ResultElementLineNumberSetNumber",err,error)
+    EXITS("cmfe_DataProjection_ResultElementLineNumberSetNumber")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_ResultElementLineNumberSetNumber
+
+  !
+  !================================================================================================================================
+  !
+
+  !>Sets the projection element line number for a data point in a set of data points identified by an object.
+  SUBROUTINE cmfe_DataProjection_ResultElementLineNumberSetObj(dataProjection,dataPointUserNumber, &
+    & projectionElementUserNumber,localLineNormals,err)
+    !DLLEXPORT(cmfe_DataProjection_ResultElementLineNumberSetObj)
+
+    !Argument variables
+    TYPE(cmfe_DataProjectionType), INTENT(IN) :: dataProjection !<The data projection to set attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The user number of the data points to set attributes for.
+    INTEGER(INTG), INTENT(IN) :: projectionElementUserNumber !<The projection element user number to set for the data point.
+    INTEGER(INTG), INTENT(IN) :: localLineNormals(:) !<localLineNormals(lineNormalIdx). The local line normals to set for the data point.
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+
+    ENTERS("cmfe_DataProjection_ResultElementLineNumberSetObj",err,error,*999)
+
+    CALL DataProjection_ResultElementLineNumberSet(dataProjection%dataProjection,dataPointUserNumber, &
+      & projectionElementUserNumber,localLineNormals,err,error,*999)
+
+    EXITS("cmfe_DataProjection_ResultElementLineNumberSetObj")
+    RETURN
+999 ERRORS("cmfe_DataProjection_ResultElementLineNumberSetObj",err,error)
+    EXITS("cmfe_DataProjection_ResultElementLineNumberSetObj")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_ResultElementLineNumberSetObj
+
+  !
+  !================================================================================================================================
+  !
+
   !>Returns the projection exit tag for a data point in a set of data points identified by user number.
   SUBROUTINE cmfe_DataProjection_ResultExitTagGetNumber(regionUserNumber,dataPointsUserNumber,dataProjectionUserNumber, &
     & dataPointUserNumber,projectionExitTag,err)
@@ -23003,6 +23429,74 @@ END SUBROUTINE cmfe_DataProjection_ResultExitTagGetObj
   !================================================================================================================================
   !
 
+  !>Returns the element xi for a data point in a set of data points identified by user number.
+  SUBROUTINE cmfe_DataProjection_ResultElementXiGetNumber(regionUserNumber,dataPointsUserNumber,dataProjectionUserNumber, &
+    & dataPointUserNumber,elementXi,err)
+    !DLLEXPORT(cmfe_DataProjection_ResultElementXiGetNumber)
+
+    !Argument variables
+    INTEGER(INTG), INTENT(IN) :: regionUserNumber !<The user number of the region containing the data points to get attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointsUserNumber !<The user number of the data points on the data projection in the region.
+    INTEGER(INTG), INTENT(IN) :: dataProjectionUserNumber !<The user number of the data projection containing the data points to get attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The user number of the data points to get attributes for.
+    REAL(DP), INTENT(OUT) :: elementXi(:) !<On return, the element xi for the data point.
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+    TYPE(DataPointsType), POINTER :: dataPoints
+    TYPE(DataProjectionType), POINTER :: dataProjection
+    TYPE(REGION_TYPE), POINTER :: region
+
+    ENTERS("cmfe_DataProjection_ResultElementXiGetNumber",err,error,*999)
+
+    NULLIFY(region)
+    NULLIFY(dataPoints)
+    NULLIFY(dataProjection)
+    CALL Region_Get(regionUserNumber,region,err,error,*999)
+    CALL Region_DataPointsGet(region,dataPointsUserNumber,dataPoints,err,error,*999)
+    CALL DataPoints_DataProjectionGet(dataPoints,dataProjectionUserNumber,dataProjection,err,error,*999)
+    CALL DataProjection_ResultElementXiGet(dataProjection,dataPointUserNumber,elementXi,err,error,*999)
+
+    EXITS("cmfe_DataProjection_ResultElementXiGetNumber")
+    RETURN
+999 ERRORS("cmfe_DataProjection_ResultElementXiGetNumber",err,error)
+    EXITS("cmfe_DataProjection_ResultElementXiGetNumber")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_ResultElementXiGetNumber
+
+  !
+  !================================================================================================================================
+  !
+
+  !>Returns the element xi for a data point in a set of data points identified by an object.
+  SUBROUTINE cmfe_DataProjection_ResultElementXiGetObj(dataProjection,dataPointUserNumber,elementXi,err)
+    !DLLEXPORT(cmfe_DataProjection_ResultElementXiGetObj)
+
+    !Argument variables
+    TYPE(cmfe_DataProjectionType), INTENT(IN) :: dataProjection !<The data projection to get attributes for.
+    INTEGER(INTG), INTENT(IN) :: dataPointUserNumber !<The user number of the data points to get attributes for.
+    REAL(DP), INTENT(OUT) :: elementXi(:) !<On return, the element xi for the data point.
+    INTEGER(INTG), INTENT(OUT) :: err !<The error code.
+    !Local variables
+
+    ENTERS("cmfe_DataProjection_ResultElementXiGetObj",err,error,*999)
+
+    CALL DataProjection_ResultElementXiGet(dataProjection%dataProjection,dataPointUserNumber,elementXi,err,error,*999)
+
+    EXITS("cmfe_DataProjection_ResultElementXiGetObj")
+    RETURN
+999 ERRORS("cmfe_DataProjection_ResultElementXiGetObj",err,error)
+    EXITS("cmfe_DataProjection_ResultElementXiGetObj")
+    CALL cmfe_HandleError(err,error)
+    RETURN
+
+  END SUBROUTINE cmfe_DataProjection_ResultElementXiGetObj
+
+  !
+  !================================================================================================================================
+  !
+
   !>Returns the maximum error for a data projection given by numbers.
   SUBROUTINE cmfe_DataProjection_ResultMaximumErrorGetNumber(regionUserNumber,dataPointsUserNumber,dataProjectionUserNumber, &
     & maximumDataPointUserNumber,maximumError,err)
@@ -23206,9 +23700,9 @@ END SUBROUTINE cmfe_DataProjection_ResultRMSErrorGetObj
   !
 
   !>Returns the projection xi for a data point in a set of data points identified by user number.
-  SUBROUTINE cmfe_DataProjection_ResultXiGetNumber(regionUserNumber,dataPointsUserNumber,dataProjectionUserNumber, &
+  SUBROUTINE cmfe_DataProjection_ResultProjectionXiGetNumber(regionUserNumber,dataPointsUserNumber,dataProjectionUserNumber, &
     & dataPointUserNumber,projectionXi,err)
-    !DLLEXPORT(cmfe_DataProjection_ResultXiGetNumber)
+    !DLLEXPORT(cmfe_DataProjection_ResultProjectionXiGetNumber)
 
     !Argument variables
     INTEGER(INTG), INTENT(IN) :: regionUserNumber !<The user number of the region containing the data points to get attributes for.
@@ -23222,7 +23716,7 @@ SUBROUTINE cmfe_DataProjection_ResultXiGetNumber(regionUserNumber,dataPointsUser
     TYPE(DataProjectionType), POINTER :: dataProjection
     TYPE(REGION_TYPE), POINTER :: region
 
-    ENTERS("cmfe_DataProjection_ResultXiGetNumber",err,error,*999)
+    ENTERS("cmfe_DataProjection_ResultProjectionXiGetNumber",err,error,*999)
 
     NULLIFY(region)
     NULLIFY(dataPoints)
@@ -23230,23 +23724,24 @@ SUBROUTINE cmfe_DataProjection_ResultXiGetNumber(regionUserNumber,dataPointsUser
     CALL Region_Get(regionUserNumber,region,err,error,*999)
     CALL Region_DataPointsGet(region,dataPointsUserNumber,dataPoints,err,error,*999)
     CALL DataPoints_DataProjectionGet(dataPoints,dataProjectionUserNumber,dataProjection,err,error,*999)
-    CALL DataProjection_ResultXiGet(dataProjection,dataPointUserNumber,projectionXi,err,error,*999)
+    CALL DataProjection_ResultProjectionXiGet(dataProjection,dataPointUserNumber,projectionXi,err,error,*999)
 
-    EXITS("cmfe_DataProjection_ResultXiGetNumber")
+    EXITS("cmfe_DataProjection_ResultProjectionXiGetNumber")
     RETURN
-999 ERRORSEXITS("cmfe_DataProjection_ResultXiGetNumber",err,error)
+999 ERRORS("cmfe_DataProjection_ResultProjectionXiGetNumber",err,error)
+    EXITS("cmfe_DataProjection_ResultProjectionXiGetNumber")
     CALL cmfe_HandleError(err,error)
     RETURN
 
-  END SUBROUTINE cmfe_DataProjection_ResultXiGetNumber
+  END SUBROUTINE cmfe_DataProjection_ResultProjectionXiGetNumber
 
   !
   !================================================================================================================================
   !
 
   !>Returns the projection xi for a data point in a set of data points identified by an object.
-  SUBROUTINE cmfe_DataProjection_ResultXiGetObj(dataProjection,dataPointUserNumber,projectionXi,err)
-    !DLLEXPORT(cmfe_DataProjection_ResultXiGetObj)
+  SUBROUTINE cmfe_DataProjection_ResultProjectionXiGetObj(dataProjection,dataPointUserNumber,projectionXi,err)
+    !DLLEXPORT(cmfe_DataProjection_ResultProjectionXiGetObj)
 
     !Argument variables
     TYPE(cmfe_DataProjectionType), INTENT(IN) :: dataProjection !<The data projection to get attributes for.
@@ -23255,26 +23750,27 @@ SUBROUTINE cmfe_DataProjection_ResultXiGetObj(dataProjection,dataPointUserNumber
     INTEGER(INTG), INTENT(OUT) :: err !<The error code.
     !Local variables
 
-    ENTERS("cmfe_DataProjection_ResultXiGetObj",err,error,*999)
+    ENTERS("cmfe_DataProjection_ResultProjectionXiGetObj",err,error,*999)
 
-    CALL DataProjection_ResultXiGet(dataProjection%dataProjection,dataPointUserNumber,projectionXi,err,error,*999)
+    CALL DataProjection_ResultProjectionXiGet(dataProjection%dataProjection,dataPointUserNumber,projectionXi,err,error,*999)
 
-    EXITS("cmfe_DataProjection_ResultXiGetObj")
+    EXITS("cmfe_DataProjection_ResultProjectionXiGetObj")
     RETURN
-999 ERRORSEXITS("cmfe_DataProjection_ResultXiGetObj",err,error)
+999 ERRORS("cmfe_DataProjection_ResultProjectionXiGetObj",err,error)
+    EXITS("cmfe_DataProjection_ResultProjectionXiGetObj")
     CALL cmfe_HandleError(err,error)
     RETURN
 
-  END SUBROUTINE cmfe_DataProjection_ResultXiGetObj
+  END SUBROUTINE cmfe_DataProjection_ResultProjectionXiGetObj
 
   !
   !================================================================================================================================
   !
 
   !>Sets the projection xi for a data point in a set of data points identified by user number.
-  SUBROUTINE cmfe_DataProjection_ResultXiSetNumber(regionUserNumber,dataPointsUserNumber,dataProjectionUserNumber, &
+  SUBROUTINE cmfe_DataProjection_ResultProjectionXiSetNumber(regionUserNumber,dataPointsUserNumber,dataProjectionUserNumber, &
     & dataPointUserNumber,projectionXi,err)
-    !DLLEXPORT(cmfe_DataProjection_ResultXiSetNumber)
+    !DLLEXPORT(cmfe_DataProjection_ResultProjectionXiSetNumber)
 
     !Argument variables
     INTEGER(INTG), INTENT(IN) :: regionUserNumber !<The user number of the region containing the data points to set attributes for.
@@ -23288,7 +23784,7 @@ SUBROUTINE cmfe_DataProjection_ResultXiSetNumber(regionUserNumber,dataPointsUser
     TYPE(DataProjectionType), POINTER :: dataProjection
     TYPE(REGION_TYPE), POINTER :: region
 
-    ENTERS("cmfe_DataProjection_ResultXiSetNumber",err,error,*999)
+    ENTERS("cmfe_DataProjection_ResultProjectionXiSetNumber",err,error,*999)
 
     NULLIFY(region)
     NULLIFY(dataPoints)
@@ -23296,23 +23792,24 @@ SUBROUTINE cmfe_DataProjection_ResultXiSetNumber(regionUserNumber,dataPointsUser
     CALL Region_Get(regionUserNumber,region,err,error,*999)
     CALL Region_DataPointsGet(region,dataPointsUserNumber,dataPoints,err,error,*999)
     CALL DataPoints_DataProjectionGet(dataPoints,dataProjectionUserNumber,dataProjection,err,error,*999)
-    CALL DataProjection_ResultXiSet(dataProjection,dataPointUserNumber,ProjectionXi,err,error,*999)
+    CALL DataProjection_ResultProjectionXiSet(dataProjection,dataPointUserNumber,ProjectionXi,err,error,*999)
 
-    EXITS("cmfe_DataProjection_ResultXiSetNumber")
+    EXITS("cmfe_DataProjection_ResultProjectionXiSetNumber")
     RETURN
-999 ERRORSEXITS("cmfe_DataProjection_ResultXiSetNumber",err,error)
+999 ERRORS("cmfe_DataProjection_ResultProjectionXiSetNumber",err,error)
+    EXITS("cmfe_DataProjection_ResultProjectionXiSetNumber")
     CALL cmfe_HandleError(err,error)
     RETURN
 
-  END SUBROUTINE cmfe_DataProjection_ResultXiSetNumber
+  END SUBROUTINE cmfe_DataProjection_ResultProjectionXiSetNumber
 
   !
   !================================================================================================================================
   !
 
   !>Sets the projection xi for a data point in a set of data points identified by an object.
-  SUBROUTINE cmfe_DataProjection_ResultXiSetObj(dataProjection,dataPointUserNumber,projectionXi,err)
-    !DLLEXPORT(cmfe_DataProjection_ResultXiSetObj)
+  SUBROUTINE cmfe_DataProjection_ResultProjectionXiSetObj(dataProjection,dataPointUserNumber,projectionXi,err)
+    !DLLEXPORT(cmfe_DataProjection_ResultProjectionXiSetObj)
 
     !Argument variables
     TYPE(cmfe_DataProjectionType), INTENT(IN) :: dataProjection !<The data projection to set attributes for.
@@ -23321,17 +23818,18 @@ SUBROUTINE cmfe_DataProjection_ResultXiSetObj(dataProjection,dataPointUserNumber
     INTEGER(INTG), INTENT(OUT) :: err !<The error code.
     !Local variables
 
-    ENTERS("cmfe_DataProjection_ResultXiSetObj",err,error,*999)
+    ENTERS("cmfe_DataProjection_ResultProjectionXiSetObj",err,error,*999)
 
-    CALL DataProjection_ResultXiSet(dataProjection%dataProjection,dataPointUserNumber,projectionXi,err,error,*999)
+    CALL DataProjection_ResultProjectionXiSet(dataProjection%dataProjection,dataPointUserNumber,projectionXi,err,error,*999)
 
-    EXITS("cmfe_DataProjection_ResultXiSetObj")
+    EXITS("cmfe_DataProjection_ResultProjectionXiSetObj")
     RETURN
-999 ERRORSEXITS("cmfe_DataProjection_ResultXiSetObj",err,error)
+999 ERRORS("cmfe_DataProjection_ResultProjectionXiSetObj",err,error)
+    EXITS("cmfe_DataProjection_ResultProjectionXiSetObj")
     CALL cmfe_HandleError(err,error)
     RETURN
 
-  END SUBROUTINE cmfe_DataProjection_ResultXiSetObj
+  END SUBROUTINE cmfe_DataProjection_ResultProjectionXiSetObj
 
   !
   !================================================================================================================================
@@ -23871,7 +24369,7 @@ SUBROUTINE cmfe_DataProjection_StartingXiGetNumber(regionUserNumber,dataPointsUs
     INTEGER(INTG), INTENT(IN) :: regionUserNumber !<The region user number of the data projection to get starting xi for.
     INTEGER(INTG), INTENT(IN) :: dataPointsUserNumber !<The user number of the data points on the data projection in the region.
     INTEGER(INTG), INTENT(IN) :: dataProjectionUserNumber !<The data projection user number of the data projection to get starting xi for.
-    REAL(DP), INTENT(OUT) :: startingXi(:) !<On exit, the absolute starting xi of the specified data projection
+    REAL(DP), INTENT(OUT) :: startingXi(:,:) !<On exit, the absolute starting xi of the specified data projection
     INTEGER(INTG), INTENT(OUT) :: err !<The error code.
     !Local variables
     TYPE(REGION_TYPE), POINTER :: region
@@ -23907,7 +24405,7 @@ SUBROUTINE cmfe_DataProjection_StartingXiGetObj(dataProjection,startingXi,err)
 
     !Argument variables
     TYPE(cmfe_DataProjectionType), INTENT(INOUT) :: dataProjection !<The data projection to get starting xi for.
-    REAL(DP), INTENT(OUT) :: startingXi(:) !<On exit, the absolute starting xi of the specified data projection
+    REAL(DP), INTENT(OUT) :: startingXi(:,:) !<On exit, the absolute starting xi of the specified data projection
     INTEGER(INTG), INTENT(OUT) :: err !<The error code.
     !Local variables
 
@@ -23935,7 +24433,7 @@ SUBROUTINE cmfe_DataProjection_StartingXiSetNumber(regionUserNumber,dataPointsUs
     INTEGER(INTG), INTENT(IN) :: regionUserNumber !<The region use number of data projection to set starting xi for.
     INTEGER(INTG), INTENT(IN) :: dataPointsUserNumber !<The user number of the data points on the data projection in the region.
     INTEGER(INTG), INTENT(IN) :: dataProjectionUserNumber !<The data projection user number of the data projection to get starting xi for.
-    REAL(DP), INTENT(IN) :: startingXi(:) !<the absolute starting xi to set
+    REAL(DP), INTENT(IN) :: startingXi(:,:) !<the absolute starting xi to set
     INTEGER(INTG), INTENT(OUT) :: err !<The error code.
     !Local variables
     TYPE(REGION_TYPE), POINTER :: region
@@ -23970,7 +24468,7 @@ SUBROUTINE cmfe_DataProjection_StartingXiSetObj(dataProjection,startingXi,err)
 
     !Argument variables
     TYPE(cmfe_DataProjectionType), INTENT(INOUT) :: dataProjection !<The data projection to set starting xi for.
-    REAL(DP), INTENT(IN) :: startingXi(:) !<the absolute starting xi to set
+    REAL(DP), INTENT(IN) :: startingXi(:,:) !<the absolute starting xi to set
     INTEGER(INTG), INTENT(OUT) :: err !<The error code.
     !Local variables
 
diff --git a/src/types.F90 b/src/types.F90
index f31c42b5..d661e516 100644
--- a/src/types.F90
+++ b/src/types.F90
@@ -288,7 +288,9 @@ MODULE Types
   TYPE DataProjectionResultType
     INTEGER(INTG) :: userNumber !<The user number of the data point to which the projection result corresponds to.   
     REAL(DP) :: distance !<The distances between the data point and the projection. Assigned only if dataPointsProjected is .TRUE.
-    INTEGER(INTG) :: elementNumber !<The element of the mesh the data point projects onto. Assigned only if dataPointsProjected is .TRUE.
+    INTEGER(INTG) :: elementLocalNumber !<The local element of the mesh the data point projects onto. Assigned only if dataPointsProjected is .TRUE.
+    
+    INTEGER(INTG) :: elementGlobalNumber !<The global element of the mesh the data point projects onto. Assigned only if dataPointsProjected is .TRUE.
     INTEGER(INTG) :: elementLineFaceNumber !<The element line/face of the mesh the data point projects onto. Assigned only if dataPointsProjected is .TRUE. and DATA_PROJECTION_BOUNDARY_FACES_PROJECTION_TYPE or DATA_PROJECTION_BOUNDARY_LINES_PROJECTION_TYPE is chosen    
     INTEGER(INTG) :: exitTag !<The exit tag of the data projection. Assigned only if dataPointsProjected is .TRUE. \See DataProtectionRoutines,DataProjectionRoutines_DataProjectionTypes 
     REAL(DP), ALLOCATABLE :: xi(:) !<The xi coordinate of the projection. Assigned only if dataPointsProjected is .TRUE.
@@ -324,7 +326,7 @@ MODULE Types
     INTEGER(INTG) :: numberOfClosestElements !<The number of closest elements to perform full projection on. The algorithm first find the distance of the data point to each elements base on starting xi, full projection is only performed on the first few elements sorted by the distance
     REAL(DP) :: absoluteTolerance !<The absolute tolerance of the iteration update
     REAL(DP) :: relativeTolerance !<The relative tolerance of the iteration update
-    REAL(DP), ALLOCATABLE :: startingXi(:) !<The starting value of the element xi
+    REAL(DP), ALLOCATABLE :: startingXi(:,:) !<The starting value of the element xi
     INTEGER(INTG) :: maxNumberOfCandidates !<The maximum number of projection candidate elements.
     TYPE(DataProjectionCandidateType), ALLOCATABLE :: dataProjectionCandidates(:) !<projectionCandidates(dataIdx). The projection candidates for the dataIdx'th data point. The 0'th index contains the default projection candidates which can then be overridden for specific data points.
     TYPE(DataProjectionResultType), ALLOCATABLE :: dataProjectionResults(:) !<dataProjectionResults(dataIdx). The data projection results for the dataIdx'th data point.