diff --git a/Modules/Segmentation/Interactions/mitkContourTool.cpp b/Modules/Segmentation/Interactions/mitkContourTool.cpp
index 3cc6e941fe..e203192d1a 100644
--- a/Modules/Segmentation/Interactions/mitkContourTool.cpp
+++ b/Modules/Segmentation/Interactions/mitkContourTool.cpp
@@ -1,180 +1,114 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "mitkContourTool.h"
 
-#include "mitkAbstractTransformGeometry.h"
-#include "mitkOverwriteDirectedPlaneImageFilter.h"
-#include "mitkOverwriteSliceImageFilter.h"
-#include "mitkToolManager.h"
-
-#include "mitkBaseRenderer.h"
-#include "mitkRenderingManager.h"
-
-#include "mitkInteractionEvent.h"
-#include "mitkStateMachineAction.h"
-
 mitk::ContourTool::ContourTool(int paintingPixelValue)
   : FeedbackContourTool("PressMoveReleaseWithCTRLInversion"),
     m_PaintingPixelValue(paintingPixelValue)
 {
 }
 
 mitk::ContourTool::~ContourTool()
 {
 }
 
 void mitk::ContourTool::ConnectActionsAndFunctions()
 {
   CONNECT_FUNCTION("PrimaryButtonPressed", OnMousePressed);
   CONNECT_FUNCTION("Move", OnMouseMoved);
   CONNECT_FUNCTION("Release", OnMouseReleased);
   CONNECT_FUNCTION("InvertLogic", OnInvertLogic);
 }
 
 void mitk::ContourTool::Activated()
 {
   Superclass::Activated();
 }
 
 void mitk::ContourTool::Deactivated()
 {
   Superclass::Deactivated();
 }
 
 /**
  Just show the contour, insert the first point.
 */
 void mitk::ContourTool::OnMousePressed(StateMachineAction *, InteractionEvent *interactionEvent)
 {
   auto *positionEvent = dynamic_cast<mitk::InteractionPositionEvent *>(interactionEvent);
   if (!positionEvent)
     return;
 
   m_LastEventSender = positionEvent->GetSender();
   m_LastEventSlice = m_LastEventSender->GetSlice();
 
-  int timestep = positionEvent->GetSender()->GetTimeStep();
-
-  ContourModel *contour = FeedbackContourTool::GetFeedbackContour();
-  // Clear feedback contour
-  contour->Initialize();
-  // expand time bounds because our contour was initialized
-  contour->Expand(timestep + 1);
-  // draw as a closed contour
-  contour->SetClosed(true, timestep);
-  // add first mouse position
+  this->ClearsCurrentFeedbackContour(true);
   mitk::Point3D point = positionEvent->GetPositionInWorld();
-  contour->AddVertex(point, timestep);
+  this->AddVertexToCurrentFeedbackContour(point);
 
   FeedbackContourTool::SetFeedbackContourVisible(true);
   assert(positionEvent->GetSender()->GetRenderWindow());
   mitk::RenderingManager::GetInstance()->RequestUpdate(positionEvent->GetSender()->GetRenderWindow());
 }
 
 /**
  Insert the point to the feedback contour.
 */
 void mitk::ContourTool::OnMouseMoved(StateMachineAction *, InteractionEvent *interactionEvent)
 {
   auto *positionEvent = dynamic_cast<mitk::InteractionPositionEvent *>(interactionEvent);
   if (!positionEvent)
     return;
 
-  int timestep = positionEvent->GetSender()->GetTimeStep();
-
-  ContourModel *contour = FeedbackContourTool::GetFeedbackContour();
   mitk::Point3D point = positionEvent->GetPositionInWorld();
-  contour->AddVertex(point, timestep);
+  this->AddVertexToCurrentFeedbackContour(point);
 
   assert(positionEvent->GetSender()->GetRenderWindow());
   mitk::RenderingManager::GetInstance()->RequestUpdate(positionEvent->GetSender()->GetRenderWindow());
 }
 
 /**
   Close the contour, project it to the image slice and fill it in 2D.
 */
 void mitk::ContourTool::OnMouseReleased(StateMachineAction *, InteractionEvent *interactionEvent)
 {
-  // 1. Hide the feedback contour, find out which slice the user clicked, find out which slice of the toolmanager's
-  // working image corresponds to that
-  FeedbackContourTool::SetFeedbackContourVisible(false);
-
   auto *positionEvent = dynamic_cast<mitk::InteractionPositionEvent *>(interactionEvent);
-  // const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent)
     return;
 
   assert(positionEvent->GetSender()->GetRenderWindow());
   mitk::RenderingManager::GetInstance()->RequestUpdate(positionEvent->GetSender()->GetRenderWindow());
 
-  DataNode *workingNode(m_ToolManager->GetWorkingData(0));
-  if (!workingNode)
-    return;
-
-  auto workingImage = dynamic_cast<Image *>(workingNode->GetData());
-  const PlaneGeometry *planeGeometry((positionEvent->GetSender()->GetCurrentWorldPlaneGeometry()));
-  if (!workingImage || !planeGeometry)
-    return;
-
-  const auto *abstractTransformGeometry(
-    dynamic_cast<const AbstractTransformGeometry *>(positionEvent->GetSender()->GetCurrentWorldPlaneGeometry()));
-  if (!workingImage || abstractTransformGeometry)
-    return;
-
-  // 2. Slice is known, now we try to get it as a 2D image and project the contour into index coordinates of this slice
-  Image::Pointer slice = SegTool2D::GetAffectedImageSliceAs2DImage(positionEvent, workingImage);
-
-  if (slice.IsNull())
-  {
-    MITK_ERROR << "Unable to extract slice." << std::endl;
-    return;
-  }
-
-  ContourModel *feedbackContour = FeedbackContourTool::GetFeedbackContour();
-  ContourModel::Pointer projectedContour = FeedbackContourTool::ProjectContourTo2DSlice(
-    slice, feedbackContour, true, false); // true: actually no idea why this is neccessary, but it works :-(
-
-  if (projectedContour.IsNull())
-    return;
-
-  int timestep = positionEvent->GetSender()->GetTimeStep();
-  int activePixelValue = ContourModelUtils::GetActivePixelValue(workingImage);
-
-  // m_PaintingPixelValue only decides whether to paint or erase
-  mitk::ContourModelUtils::FillContourInSlice(
-    projectedContour, timestep, slice, workingImage, m_PaintingPixelValue * activePixelValue);
-
-  // this->WriteBackSegmentationResult(positionEvent, slice);
-  SegTool2D::WriteBackSegmentationResult(positionEvent, slice);
+  this->WriteBackFeedbackContourAsSegmentationResult(positionEvent, m_PaintingPixelValue);
 
   // 4. Make sure the result is drawn again --> is visible then.
   assert(positionEvent->GetSender()->GetRenderWindow());
 }
 
 /**
   Called when the CTRL key is pressed. Will change the painting pixel value from 0 to 1 or from 1 to 0.
 */
 void mitk::ContourTool::OnInvertLogic(StateMachineAction *, InteractionEvent *)
 {
   // Inversion only for 0 and 1 as painting values
   if (m_PaintingPixelValue == 1)
   {
     m_PaintingPixelValue = 0;
     FeedbackContourTool::SetFeedbackContourColor(1.0, 0.0, 0.0);
   }
   else if (m_PaintingPixelValue == 0)
   {
     m_PaintingPixelValue = 1;
     FeedbackContourTool::SetFeedbackContourColorDefault();
   }
 }