diff --git a/Modules/SurfaceRegistration/include/MitkShapeComparisonManager.h b/Modules/SurfaceRegistration/include/MitkShapeComparisonManager.h
index 846cdc70d9..a7e12b20b2 100644
--- a/Modules/SurfaceRegistration/include/MitkShapeComparisonManager.h
+++ b/Modules/SurfaceRegistration/include/MitkShapeComparisonManager.h
@@ -1,50 +1,52 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef MitkShapeComparisonManager_h
 #define MitkShapeComparisonManager_h
 
 #include "mitkSurface.h"
 #include <mitkWeakPointer.h>
 #include "mitkDataNode.h"
 
 //#include "mitkSurfaceRegistrationICP.h"
 
 #include <MitkSurfaceRegistrationExports.h>
 
 namespace mitk
 {
   class MITKSURFACEREGISTRATION_EXPORT ShapeComparisonManager
   {
   public:
 
     ShapeComparisonManager();
     ~ShapeComparisonManager();
 
     void setMovingSurface(mitk::Surface::Pointer moving);
     void setTargetSurface(mitk::Surface::Pointer target);
 
     mitk::DataNode::Pointer manageICPCalculation();
     void manageCalculateDistances();
 
   private:
 
     mitk::Surface::Pointer m_MovingSurface;
     mitk::Surface::Pointer m_TargetSurface;
+    mitk::Surface::Pointer m_registeredSurface;
+
   };
 }
 
 #endif
diff --git a/Modules/SurfaceRegistration/src/DataManagement/MitkShortestDistanceCalculator.cpp b/Modules/SurfaceRegistration/src/DataManagement/MitkShortestDistanceCalculator.cpp
index deee49f439..c3d6b7f613 100644
--- a/Modules/SurfaceRegistration/src/DataManagement/MitkShortestDistanceCalculator.cpp
+++ b/Modules/SurfaceRegistration/src/DataManagement/MitkShortestDistanceCalculator.cpp
@@ -1,51 +1,58 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #include "mitkShortestDistanceCalculator.h"
 
 #include "vtkCellLocator.h"
 #include "vtkPointData.h"
 #include "vtkImplicitPolyDataDistance.h"
 #include "vtkFloatArray.h"
 
+#include <cmath>        // std::abs
+
 
 mitk::ShortestDistanceCalculator::ShortestDistanceCalculator()
 {
  
 }
 
 mitk::ShortestDistanceCalculator::~ShortestDistanceCalculator()
 {
  
 }
 
 void mitk::ShortestDistanceCalculator::calculateShortestDistance(vtkSmartPointer<vtkPolyData> moving, vtkSmartPointer<vtkPolyData> target)
 {
   // was passiert wenn der andere pointset groesser ist
   MITK_INFO << "calculate shortest distance ...";
   std::vector<double> *distances = new std::vector<double>();
   double fromPoint[3] = { 0, 0, 0 };
   int pointNumber = moving->GetPoints()->GetNumberOfPoints();
   vtkSmartPointer<vtkImplicitPolyDataDistance> implicitPolyDataDistance =
     vtkSmartPointer<vtkImplicitPolyDataDistance>::New();
-  implicitPolyDataDistance->SetInput(moving);
-  //
+  implicitPolyDataDistance->SetInput(target);
+  //test
+  double mean = 0;
   for (int i = 0; i < pointNumber; ++i)
   {
     moving->GetPoints()->GetPoint(i, fromPoint);
     double distance = implicitPolyDataDistance->FunctionValue(fromPoint[0], fromPoint[1], fromPoint[2]);
+   // MITK_INFO << distance; 
     distances->push_back(distance);
+    mean += std::abs(distance);
   }
+  mean = mean / pointNumber;
+  MITK_INFO << "The mean is: " << mean;
 }
\ No newline at end of file
diff --git a/Modules/SurfaceRegistration/src/DataManagement/mitkSurfaceRegistrationICP.cpp b/Modules/SurfaceRegistration/src/DataManagement/mitkSurfaceRegistrationICP.cpp
index 8ab7ab204a..249d898b51 100644
--- a/Modules/SurfaceRegistration/src/DataManagement/mitkSurfaceRegistrationICP.cpp
+++ b/Modules/SurfaceRegistration/src/DataManagement/mitkSurfaceRegistrationICP.cpp
@@ -1,56 +1,52 @@
 #include "mitkSurfaceRegistrationICP.h"
 
 #include <vtkSmartPointer.h>
 #include <vtkPolyData.h>
 #include <vtkIterativeClosestPointTransform.h>
 #include <vtkTransformPolyDataFilter.h>
 #include <vtkTransform.h>
 #include <vtkLandmarkTransform.h>
 #include <vtkMatrix4x4.h>
 
 mitk::SurfaceRegistrationICP::SurfaceRegistrationICP()
 {
 }
 
 mitk::SurfaceRegistrationICP::~SurfaceRegistrationICP()
 {
 }
 
 mitk::Surface::Pointer mitk::SurfaceRegistrationICP::CalculateICP(mitk::Surface::Pointer movingSurface, mitk::Surface::Pointer targetSurface) 
 {
   vtkSmartPointer<vtkIterativeClosestPointTransform> icp = vtkSmartPointer<vtkIterativeClosestPointTransform>::New();
   icp->SetCheckMeanDistance(1);
   mitk::Surface::Pointer movedData = mitk::Surface::New();
 
   icp->SetSource(movingSurface->GetVtkPolyData());
   icp->SetTarget(targetSurface->GetVtkPolyData());
   icp->SetMaximumNumberOfIterations(1000);
   icp->SetMaximumMeanDistance(0.01);
   icp->SetMeanDistanceModeToRMS();
   icp->StartByMatchingCentroidsOn();
   icp->SetMaximumNumberOfLandmarks(100000);
   icp->Modified();
   vtkSmartPointer<vtkLandmarkTransform> transform = vtkSmartPointer<vtkLandmarkTransform>::New();
   transform = icp->GetLandmarkTransform();
 
   vtkSmartPointer<vtkTransformPolyDataFilter> icpTransformFilter =
     vtkSmartPointer<vtkTransformPolyDataFilter>::New();
   icpTransformFilter->SetInputData(movingSurface->GetVtkPolyData());
   icpTransformFilter->SetTransform(icp);
   icpTransformFilter->Update();
 
   vtkSmartPointer<vtkMatrix4x4> m = icp->GetMatrix();
   MITK_INFO << "The resulting matrix is: " << *m;
   MITK_INFO << "The mean distance is: " << icp->GetMeanDistance();
 
   movedData->SetVtkPolyData(icpTransformFilter->GetOutput());
   movedData->Modified();
-  //clean up
-  icpTransformFilter->Delete();
-  transform->Delete();
-  icp->Delete();
 
   MITK_INFO << "registration done";
 
   return movedData;
 }
\ No newline at end of file
diff --git a/Modules/SurfaceRegistration/src/mitkShapeComparisonManager.cpp b/Modules/SurfaceRegistration/src/mitkShapeComparisonManager.cpp
index c32e3ccb22..5f8ae27404 100644
--- a/Modules/SurfaceRegistration/src/mitkShapeComparisonManager.cpp
+++ b/Modules/SurfaceRegistration/src/mitkShapeComparisonManager.cpp
@@ -1,58 +1,58 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include <mitkShapeComparisonManager.h>
 #include <mitkShortestDistanceCalculator.h>
 #include <mitkSurfaceRegistrationICP.h>
 
 mitk::ShapeComparisonManager::ShapeComparisonManager()
 {
 }
 
 mitk::ShapeComparisonManager::~ShapeComparisonManager()
 {
   m_MovingSurface->Delete();
   m_TargetSurface->Delete();
 }
 
 void mitk::ShapeComparisonManager::setMovingSurface(mitk::Surface::Pointer moving)
 {
   this->m_MovingSurface = moving;
 }
 
 void mitk::ShapeComparisonManager::setTargetSurface(mitk::Surface::Pointer target)
 {
   this->m_TargetSurface = target;
 }
 
 mitk::DataNode::Pointer mitk::ShapeComparisonManager::manageICPCalculation()
 {
-  mitk::Surface::Pointer moveCopy = mitk::Surface::New();
-  //moveCopy->SetVtkPolyData(m_MovingSurface->GetVtkPolyData());
+  m_registeredSurface = mitk::Surface::New();
   mitk::DataNode::Pointer registeredNode = mitk::DataNode::New();
   mitk::SurfaceRegistrationICP *registrationHelper = new SurfaceRegistrationICP();
-  moveCopy = registrationHelper->CalculateICP(m_MovingSurface, m_TargetSurface);
-  registeredNode->SetData(moveCopy);
+  m_registeredSurface = registrationHelper->CalculateICP(m_MovingSurface, m_TargetSurface);
+  registeredNode->SetData(m_registeredSurface);
+
   manageCalculateDistances();
 
   return registeredNode;
 }
 void mitk::ShapeComparisonManager::manageCalculateDistances()
 {
-  //mitk::ShortestDistanceCalculator *distanceCalculator = new ShortestDistanceCalculator();
-  //distanceCalculator->calculateShortestDistance(m_MovingSurface->GetVtkPolyData(), m_TargetSurface->GetVtkPolyData());
+  mitk::ShortestDistanceCalculator *distanceCalculator = new ShortestDistanceCalculator();
+  distanceCalculator->calculateShortestDistance(m_registeredSurface->GetVtkPolyData(), m_TargetSurface->GetVtkPolyData());
 
 }
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/QmitkSurfaceRegistration.cpp b/Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/QmitkSurfaceRegistration.cpp
index fd3a6a8fbf..74ef26c4bb 100644
--- a/Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/QmitkSurfaceRegistration.cpp
+++ b/Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/QmitkSurfaceRegistration.cpp
@@ -1,210 +1,208 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 #include "QmitkSurfaceRegistration.h"
 
 #include <QAction>
 #include <QMessageBox>
 
 #include <mitkDisplayInteractor.h>
 #include <mitkIDataStorageService.h>
 #include <mitkITKImageImport.h>
 #include <mitkImageAccessByItk.h>
 #include <mitkImageCast.h> // Includes for image casting between ITK and MITK: added after using Plugin Generator
 #include <mitkSurface.h> // added for surface dynamic cast
 #include <mitkShapeComparisonManager.h>
 
 #include <usGetModuleContext.h>
 #include <usModuleRegistry.h>
 
 #include <mitkStandaloneDataStorage.h>
 #include <mitkIOUtil.h>
 #include <mitkRenderWindow.h>
 #include <mitkDataStorage.h>
 
 #include <vtkIterativeClosestPointTransform.h>
 #include <vtkLandmarkTransform.h>
 #include <vtkPolyData.h>
 #include <vtkTransformPolyDataFilter.h>
 
 const std::string QmitkSurfaceRegistration::VIEW_ID = "org.mitk.views.qmitksurfaceregistration";
 
 QmitkSurfaceRegistration::QmitkSurfaceRegistration(QObject *parent)
   : m_ParentWidget(0), m_movingSurfaceNode(nullptr), m_targetSurfaceNode(nullptr)
 {
 }
 
 QmitkSurfaceRegistration::~QmitkSurfaceRegistration()
 {
   // delete pointer objects
   m_movingSurfaceNode = nullptr;
   m_targetSurfaceNode = nullptr;
 }
 //
 
 void QmitkSurfaceRegistration::SetFocus(){
   m_Controls.groupBoxMoving->setFocus();
 }
 
 void QmitkSurfaceRegistration::CreateQtPartControl(QWidget *parent)
 {
   // create GUI widgets from the Qt Designer's .ui file
   m_Controls.setupUi(parent);
   connect(m_Controls.pushButtonExecute, SIGNAL(clicked()), this, SLOT(doExecute()));
 
   mitk::RenderingManager::GetInstance()->SetDataStorage(this->GetDataStorageReference()->GetDataStorage());
   mitk::RenderingManager::GetInstance()->InitializeViews();
 
   m_ParentWidget = parent;
 }
 
 void QmitkSurfaceRegistration::OnSelectionChanged(berry::IWorkbenchPart::Pointer /*part*/,
   const QList<mitk::DataNode::Pointer> &nodes)
 {
   MITK_INFO << "On Selection Changed";
   bool rotationEnabled = false;
 
   if (nodes.empty())
   {
     MITK_INFO << "Nothing selected yet";
     m_Controls.labelSelectMovingSurface->setStyleSheet(" QLabel { color: rgb(255, 0, 0) }");
     m_Controls.labelSelectTargetSurface->setStyleSheet(" QLabel { color: rgb(255, 0, 0) }");
     m_Controls.labelMovingSurfaceName->setText(QString::fromStdString("No moving surface selected"));
     m_Controls.labelTargetSurfaceName->setText(QString::fromStdString("No target surface selected"));
     m_Controls.groupBoxMoving->setEnabled(true);
     m_Controls.groupBoxMappedData->setEnabled(false);
     if (m_useTestConfig)
     {
       m_Controls.pushButtonExecute->setEnabled(true);
     }
     else{
       m_Controls.pushButtonExecute->setEnabled(false);
     }
     m_Controls.radioButtonMirroring->setEnabled(false);
     return;
   }
   else
   {
     if (nodes.size() == 1)
     {
       if (nodes[0].IsNotNull() && dynamic_cast<mitk::Surface *>(nodes[0]->GetData()))
       {
         MITK_INFO << "There is exactly one image selected";
         m_movingSurfaceNode = nodes[0];
         m_Controls.labelSelectMovingSurface->setText("Selected moving surface:");
         m_Controls.labelSelectMovingSurface->setStyleSheet(" QLabel { color: rgb(0, 0, 0) }");
         m_Controls.labelMovingSurfaceName->setText(
           QString::fromStdString("File name: " + m_movingSurfaceNode->GetName()));
         m_Controls.radioButtonMirroring->setEnabled(true);
         m_Controls.groupBoxTarget->setEnabled(true);
         m_Controls.groupBoxMappedData->setEnabled(true);
         m_Controls.groupBoxTarget->setEnabled(true);
         mitk::RenderingManager::GetInstance()->RequestUpdateAll();
       }
       else
       {
         QMessageBox::information(nullptr, "Warning", "Are you sure? - I dont think this is a Surface! Try again!");
       }
     }
     else if (nodes.size() == 2)
     {
       if (nodes[1].IsNotNull() && dynamic_cast<mitk::Surface *>(nodes[1]->GetData()))
       {
         MITK_INFO << "There are two images selected";
         m_targetSurfaceNode = nodes[1];
         m_Controls.labelSelectTargetSurface->setText("Selected target surface:");
         m_Controls.labelSelectTargetSurface->setStyleSheet(" QLabel { color: rgb(0, 0, 0) }");
         m_Controls.labelTargetSurfaceName->setText(
           QString::fromStdString("File name: " + m_targetSurfaceNode->GetName()));
         m_Controls.textMappedDataName->setEnabled(true);
         m_Controls.pushButtonExecute->setEnabled(true);
         mitk::RenderingManager::GetInstance()->RequestUpdateAll();
         m_useTestConfig = false;
       }
       else
       {
         QMessageBox::information(nullptr, "Warning", "Are you sure? - I dont think this is a Surface!");
       }
     }
     else
     {
       QMessageBox::information(nullptr, "Warning", "You do know that it only works with two surfaces, right? If you continue to click execute, this might crash one day!");
       //wie kann ich die Auswahl zurueck setzen?
     }
   }
 }
 void QmitkSurfaceRegistration::doExecute()
 {
   if (m_useTestConfig)
   {
     setUpTestConfig();
   }
   MITK_INFO << "pushButtonExecute clicked";
   performICPRegistration();
 }
 
 void QmitkSurfaceRegistration::setUpTestConfig()
 {
   mitk::StandaloneDataStorage::Pointer ds = mitk::StandaloneDataStorage::New();
   mitk::IOUtil::Load("//ad/fs/E130-Projekte/BGLU/Fibula/Python/DataGAN/Registered/Surface/Tibia/tibia01_q0.stl", *ds);
   mitk::IOUtil::Load("//ad/fs/E130-Projekte/BGLU/Fibula/Python/DataGAN/Registered/Surface/Tibia/tibia02_q0.stl", *ds);
 
   m_movingSurfaceNode = ds->GetAll()->at(0);
   m_targetSurfaceNode = ds->GetAll()->at(1);
   this->GetDataStorageReference()->GetDataStorage()->Add(mitk::DataNode::Pointer(ds->GetAll()->at(0)));
   this->GetDataStorageReference()->GetDataStorage()->Add(mitk::DataNode::Pointer(ds->GetAll()->at(1)));
   this->GetDataStorageReference()->GetDataStorage()->Modified();
 
   mitk::RenderingManager::GetInstance()->SetDataStorage(this->GetDataStorageReference()->GetDataStorage());
   mitk::RenderingManager::GetInstance()->InitializeViews();
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 
   m_Controls.pushButtonExecute->setEnabled(true);
   m_Controls.labelMovingSurfaceName->setText("tibia01_q0");
   m_Controls.labelTargetSurfaceName->setText("tibia02_q0");
   m_Controls.labelSelectMovingSurface->setText("Selected moving surface:");
   m_Controls.labelSelectMovingSurface->setStyleSheet(" QLabel { color: rgb(0, 0, 0) }");
   m_Controls.labelSelectTargetSurface->setText("Selected target surface:");
   m_Controls.labelSelectTargetSurface->setStyleSheet(" QLabel { color: rgb(0, 0, 0) }");
 
   this->GetDataStorageReference()->GetDataStorage()->Modified();
   mitk::RenderingManager::GetInstance()->InitializeViews();
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkSurfaceRegistration::performICPRegistration()
 {
   mitk::Surface::Pointer movingSurface = dynamic_cast<mitk::Surface*> (m_movingSurfaceNode->GetData());
   mitk::Surface::Pointer targetSurface = dynamic_cast<mitk::Surface*> (m_targetSurfaceNode->GetData());
 
   mitk::DataNode::Pointer registeredNode = mitk::DataNode::New();
 
   mitk::ShapeComparisonManager *manager = new mitk::ShapeComparisonManager();
   manager->setMovingSurface(movingSurface);
   manager->setTargetSurface(targetSurface);
   registeredNode = manager->manageICPCalculation();
   this->GetDataStorageReference()->GetDataStorage()->Add(registeredNode, m_movingSurfaceNode);
-
-  manager->~ShapeComparisonManager();
  
-  registeredNode->SetName("Moving");
+  registeredNode->SetName("defaultMappedDataName");
   this->GetDataStorageReference()->GetDataStorage()->Modified();
   mitk::RenderingManager::GetInstance()->InitializeViews();
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 
   MITK_INFO << "registration done";
 }
\ No newline at end of file