diff --git a/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp b/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp
index 8ab5c06b3c..243afd4d99 100644
--- a/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp
+++ b/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp
@@ -1,413 +1,398 @@
 /*===================================================================
 
 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 "mitkContourModelLiveWireInteractor.h"
 
 #include "mitkToolManager.h"
 
 #include "mitkBaseRenderer.h"
 #include "mitkRenderingManager.h"
 
 #include <mitkPositionEvent.h>
 #include <mitkStateEvent.h>
 
 #include <mitkInteractionConst.h>
 
 
 mitk::ContourModelLiveWireInteractor::ContourModelLiveWireInteractor(DataNode* dataNode)
 :ContourModelInteractor(dataNode)
 {
   m_LiveWireFilter = mitk::ImageLiveWireContourModelFilter::New();
 
   m_NextActiveVertexDown.Fill(0);
   m_NextActiveVertexUp.Fill(0);
 }
 
 mitk::ContourModelLiveWireInteractor::~ContourModelLiveWireInteractor()
 {
 }
 
 bool mitk::ContourModelLiveWireInteractor::OnCheckPointClick( Action* action, const StateEvent* stateEvent)
 {
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) {
     this->HandleEvent( new mitk::StateEvent(EIDNO, stateEvent->GetEvent()) );
     MITK_WARN << "Could not get position event";
     return false;
   }
 
   mitk::StateEvent* newStateEvent = NULL;
 
   int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
 
   mitk::ContourModel *contour = dynamic_cast<mitk::ContourModel *>( m_DataNode->GetData() );
   if (!contour)
   {
     this->HandleEvent( new mitk::StateEvent(EIDNO, stateEvent->GetEvent()) );
     MITK_WARN << "Could not get working contour";
     return false;
   }
 
   contour->Deselect();
 
   // Check distance to any vertex.
   // Transition YES if click close to a vertex
   mitk::Point3D click = positionEvent->GetWorldPosition();
 
   if (contour->SelectVertexAt(click, 1.5, timestep) )
   {
     contour->SetSelectedVertexAsControlPoint(false);
 
     m_lastMousePosition = click;
 
     m_ContourLeft = mitk::ContourModel::New();
 
     //get coordinates of next active vertex downwards from selected vertex
     int downIndex = this->SplitContourFromSelectedVertex( contour, m_ContourLeft, false, timestep);
 
-    m_LeftLiveWireContourNode->SetData(m_ContourLeft);
-
     mitk::ContourModel::VertexIterator itDown = contour->IteratorBegin() + downIndex;
     m_NextActiveVertexDown = (*itDown)->Coordinates;
 
     m_ContourRight = mitk::ContourModel::New();
 
     //get coordinates of next active vertex upwards from selected vertex
     int upIndex = this->SplitContourFromSelectedVertex( contour, m_ContourRight, true, timestep);
 
-    m_RightLiveWireContourNode->SetData(m_ContourRight);
-
     mitk::ContourModel::VertexIterator itUp = contour->IteratorBegin() + upIndex;
     m_NextActiveVertexUp = (*itUp)->Coordinates;
 
     newStateEvent = new mitk::StateEvent(EIDYES, stateEvent->GetEvent());
   }
   else
   {
-    MITK_WARN << "Could not select a vertex";
     newStateEvent = new mitk::StateEvent(EIDNO, stateEvent->GetEvent());
   }
 
   this->HandleEvent( newStateEvent );
 
   contour->SetSelectedVertexAsControlPoint(true);
 
   assert( positionEvent->GetSender()->GetRenderWindow() );
   mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
 
   return true;
 }
 
 bool mitk::ContourModelLiveWireInteractor::OnDeletePoint( Action* action, const StateEvent* stateEvent)
 {
 
   int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
 
   mitk::ContourModel *contour = dynamic_cast<mitk::ContourModel *>( m_DataNode->GetData() );
   if (!contour)
   {
     MITK_WARN << "Could not get working contour";
     return false;
   }
-/*
-  if ( (m_ContourLeft->GetNumberOfVertices() < 3) || (m_ContourRight->GetNumberOfVertices() < 3) )
-  {
-    m_ContourRight->Clear();
-    m_ContourLeft->Clear();
-    MITK_WARN << "contour left or right with less than 3 points";
-  }
-*/
-  if(contour->GetSelectedVertex())
+
+  if (contour->GetSelectedVertex())
   {
 
     mitk::ContourModel::Pointer newContour = mitk::ContourModel::New();
     newContour->Expand(contour->GetTimeSteps());
 
     newContour->Concatenate( m_ContourLeft, timestep );
 
     //recompute contour between neighbored two active control points
     this->m_LiveWireFilter->SetStartPoint( m_NextActiveVertexDown );
     this->m_LiveWireFilter->SetEndPoint( m_NextActiveVertexUp );
+    this->m_LiveWireFilter->ClearRepulsivePoints();
     this->m_LiveWireFilter->Update();
 
     mitk::ContourModel *liveWireContour = this->m_LiveWireFilter->GetOutput();
 
     if (!liveWireContour)
     {
         MITK_WARN << "could not retrieve liveWireContour";
         return false;
     }
 
-    if (liveWireContour->GetNumberOfVertices() < 3)
-    {
-        MITK_WARN << "liveWireContour has less than 3 points";
-        return false;
-    }
-
     liveWireContour->RemoveVertexAt( 0, timestep);
     liveWireContour->RemoveVertexAt( liveWireContour->GetNumberOfVertices(timestep) - 1, timestep);
 
     //insert new live wire computed points
     newContour->Concatenate( liveWireContour, timestep );
 
     // insert right side of original contour
     newContour->Concatenate( m_ContourRight, timestep );
 
     newContour->SetIsClosed(contour->IsClosed(timestep), timestep);
 
     m_DataNode->SetData(newContour);
 
     assert( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
     mitk::RenderingManager::GetInstance()->RequestUpdate( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
 
     return true;
   }
   return false;
 }
 
 bool mitk::ContourModelLiveWireInteractor::OnMovePoint( Action* action, const StateEvent* stateEvent)
 {
   const PositionEvent* positionEvent = dynamic_cast<const PositionEvent*>(stateEvent->GetEvent());
   if (!positionEvent) return false;
 
   int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
   mitk::Point3D currentPosition = positionEvent->GetWorldPosition();
 
   //recompute contour between previous active vertex and selected vertex
   this->m_LiveWireFilter->SetStartPoint( m_NextActiveVertexDown );
   this->m_LiveWireFilter->SetEndPoint( currentPosition );
 
   this->m_LiveWireFilter->ClearRepulsivePoints();
   this->m_LiveWireFilter->Update();
 
   mitk::ContourModel::Pointer leftLiveWire = this->m_LiveWireFilter->GetOutput();
   if (!leftLiveWire)
   {
     MITK_WARN << "There is no left live wire contour";
     return false;
   }
 
   leftLiveWire->RemoveVertexAt(0, timestep);
 
   //recompute contour between selected vertex and next active vertex
   this->m_LiveWireFilter->SetStartPoint( currentPosition );
   this->m_LiveWireFilter->SetEndPoint( m_NextActiveVertexUp );
   this->m_LiveWireFilter->ClearRepulsivePoints();
 
     // TODO: try using all contour points
   typedef mitk::ImageLiveWireContourModelFilter::InternalImageType::IndexType IndexType;
   mitk::ContourModel::ConstVertexIterator iter = leftLiveWire->IteratorBegin(timestep);
   for (;iter != leftLiveWire->IteratorEnd(timestep); iter++)
   {
       IndexType idx;
       this->m_WorkingImage->GetGeometry()->WorldToIndex((*iter)->Coordinates, idx);
 
       this->m_LiveWireFilter->AddRepulsivePoint( idx );
   }
 
   this->m_LiveWireFilter->Update();
 
   mitk::ContourModel::Pointer rightLiveWire = this->m_LiveWireFilter->GetOutput();
 
   if (!rightLiveWire)
   {
     MITK_WARN << "There is no right live wire contour";
     return false;
   }
 
   rightLiveWire->RemoveVertexAt(0, timestep);
 
-  leftLiveWire->SelectVertexAt(leftLiveWire->GetNumberOfVertices()-1, timestep);
   leftLiveWire->SetControlVertexAt(leftLiveWire->GetNumberOfVertices()-1, timestep);
+  //leftLiveWire->SelectVertexAt(leftLiveWire->GetNumberOfVertices()-1, timestep);
 
   // set corrected left live wire to its node
   m_LeftLiveWireContourNode->SetData(leftLiveWire);
 
   // set corrected right live wire to its node
   m_RightLiveWireContourNode->SetData(rightLiveWire);
 
   mitk::ContourModel *contour = dynamic_cast<mitk::ContourModel *>( m_DataNode->GetData() );
 
   mitk::ContourModel::Pointer newContour = mitk::ContourModel::New();
   newContour->Expand(contour->GetTimeSteps());
 
   // concatenate left original contour
   newContour->Concatenate( this->m_ContourLeft, timestep );
   newContour->Deselect();
 
   // concatenate left live wire
   newContour->Concatenate( leftLiveWire, timestep );
 
+  newContour->SelectVertexAt(newContour->GetNumberOfVertices()-1, timestep);
+
   // concatenate right live wire
   newContour->Concatenate( rightLiveWire, timestep );
 
   // concatenate right original contour
   newContour->Concatenate( this->m_ContourRight, timestep );
 
   newContour->SetIsClosed(contour->IsClosed(timestep), timestep);
 
   m_DataNode->SetData(newContour);
 
   this->m_lastMousePosition = positionEvent->GetWorldPosition();
 
   assert( positionEvent->GetSender()->GetRenderWindow() );
   mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
 
   return true;
 }
 
 int mitk::ContourModelLiveWireInteractor::SplitContourFromSelectedVertex(mitk::ContourModel* sourceContour,
                                                                          mitk::ContourModel* destContour,
                                                                          bool fromSelectedUpwards, int timestep)
 {
 
   mitk::ContourModel::VertexIterator end = sourceContour->IteratorEnd();
   mitk::ContourModel::VertexIterator begin = sourceContour->IteratorBegin();
 
   //search next active control point to left and rigth and set as start and end point for filter
   mitk::ContourModel::VertexIterator itSelected = begin;
 
   // move iterator to position
   while ((*itSelected) != sourceContour->GetSelectedVertex())
   {
     itSelected++;
   }
 
   // CASE search upwards for next control point
   if(fromSelectedUpwards)
   {
     mitk::ContourModel::VertexIterator itUp = itSelected;
 
     if(itUp != end)
     {
       itUp++;//step once up otherwise the loop breaks immediately
     }
 
     while( itUp != end && !((*itUp)->IsControlPoint))
     {
         itUp++;
     }
 
     mitk::ContourModel::VertexIterator it = itUp;
 
     if (itSelected != begin)
     {
       //copy the rest of the original contour
       while (it != end)
       {
         destContour->AddVertex( (*it)->Coordinates, (*it)->IsControlPoint, timestep);
         it++;
       }
     }
     //else do not copy the contour
 
 
     //return the offset of iterator at one before next-vertex-upwards
     if(itUp != begin)
     {
       return std::distance( begin, itUp) - 1;
     }
     else
     {
       return std::distance( begin, itUp);
     }
 
   }
   else //CASE search downwards for next control point
   {
     mitk::ContourModel::VertexIterator itDown = itSelected;
     mitk::ContourModel::VertexIterator it = sourceContour->IteratorBegin();
 
     if( itSelected != begin )
     {
       if(itDown != begin)
       {
         itDown--;//step once down otherwise the the loop breaks immediately
       }
 
       while( itDown != begin && !((*itDown)->IsControlPoint)){ itDown--; }
 
       if(it != end)//if not empty
       {
         //always add the first vertex
         destContour->AddVertex( (*it)->Coordinates, (*it)->IsControlPoint, timestep);
         it++;
       }
       //copy from begin to itDown
       while(it <= itDown)
       {
         destContour->AddVertex( (*it)->Coordinates, (*it)->IsControlPoint, timestep);
         it++;
       }
     }
     else
     {
       //if selected vertex is the first element search from end of contour downwards
       itDown = end;
       itDown--;
       while(!((*itDown)->IsControlPoint)){itDown--;}
 
       //move one forward as we don't want the first control point
       it++;
       //move iterator to second control point
       while( (it!=end) && !((*it)->IsControlPoint) ){it++;}
       //copy from begin to itDown
       while(it <= itDown)
       {
         //copy the contour from second control point to itDown
         destContour->AddVertex( (*it)->Coordinates, (*it)->IsControlPoint, timestep);
         it++;
       }
     }
 
     //add vertex at itDown - it's not considered during while loop
     if( it != begin && it != end)
     {
       //destContour->AddVertex( (*it)->Coordinates, (*it)->IsControlPoint, timestep);
     }
 
     //return the offset of iterator at one after next-vertex-downwards
     if( itDown != end)
     {
       return std::distance( begin, itDown);// + 1;//index of next vertex
     }
     else
     {
       return std::distance( begin, itDown) - 1;
     }
   }
 }
 
 
 bool mitk::ContourModelLiveWireInteractor::OnFinishEditing( Action* action, const StateEvent* stateEvent)
 {
   int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
 
   mitk::ContourModel *leftLiveWire = dynamic_cast<mitk::ContourModel *>( this->m_LeftLiveWireContourNode->GetData() );
 
   if (leftLiveWire)
     leftLiveWire->Clear(timestep);
 
   mitk::ContourModel *rightLiveWire = dynamic_cast<mitk::ContourModel *>( this->m_RightLiveWireContourNode->GetData() );
 
   if (rightLiveWire)
      rightLiveWire->Clear(timestep);
 
   assert( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
   mitk::RenderingManager::GetInstance()->RequestUpdate( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
 
   return true;
 }