diff --git a/Modules/DiffusionImaging/Tractography/itkStreamlineTrackingFilter.cpp b/Modules/DiffusionImaging/Tractography/itkStreamlineTrackingFilter.cpp
index 0c9d77c696..67d259b8b2 100644
--- a/Modules/DiffusionImaging/Tractography/itkStreamlineTrackingFilter.cpp
+++ b/Modules/DiffusionImaging/Tractography/itkStreamlineTrackingFilter.cpp
@@ -1,358 +1,366 @@
 /*===================================================================
 
 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 __itkStreamlineTrackingFilter_txx
 #define __itkStreamlineTrackingFilter_txx
 
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "itkStreamlineTrackingFilter.h"
 #include <itkImageRegionConstIterator.h>
 #include <itkImageRegionConstIteratorWithIndex.h>
 #include <itkImageRegionIterator.h>
 
 #define _USE_MATH_DEFINES
 #include <math.h>
 
 namespace itk {
 
 //#define QBALL_RECON_PI       M_PI
 
 template< class TTensorPixelType, class TPDPixelType>
 StreamlineTrackingFilter< TTensorPixelType,
 TPDPixelType>
 ::StreamlineTrackingFilter():
     m_FaThreshold(0.2),
     m_StepSize(1),
     m_MaxLength(10000),
-    m_SeedsPerVoxel(1)
+    m_SeedsPerVoxel(1),
+    m_AngularThreshold(0.7),
+    m_F(1.0),
+    m_G(0.0)
 {
     // At least 1 inputs is necessary for a vector image.
     // For images added one at a time we need at least six
     this->SetNumberOfRequiredInputs( 1 );
 }
 
 template< class TTensorPixelType,
           class TPDPixelType>
 double StreamlineTrackingFilter< TTensorPixelType,
 TPDPixelType>
 ::RoundToNearest(double num) {
     return (num > 0.0) ? floor(num + 0.5) : ceil(num - 0.5);
 }
 
 template< class TTensorPixelType,
           class TPDPixelType>
 void StreamlineTrackingFilter< TTensorPixelType,
 TPDPixelType>
 ::BeforeThreadedGenerateData()
 {
     m_FiberPolyData = FiberPolyDataType::New();
     m_Points = vtkPoints::New();
     m_Cells = vtkCellArray::New();
 
     typename InputImageType::Pointer inputImage = static_cast< InputImageType * >( this->ProcessObject::GetInput(0) );
     m_ImageSize.resize(3);
     m_ImageSize[0] = inputImage->GetLargestPossibleRegion().GetSize()[0];
     m_ImageSize[1] = inputImage->GetLargestPossibleRegion().GetSize()[1];
     m_ImageSize[2] = inputImage->GetLargestPossibleRegion().GetSize()[2];
     m_ImageSpacing.resize(3);
     m_ImageSpacing[0] = inputImage->GetSpacing()[0];
     m_ImageSpacing[1] = inputImage->GetSpacing()[1];
     m_ImageSpacing[2] = inputImage->GetSpacing()[2];
 
     if (m_StepSize<0.005)
     {
         float minSpacing;
         if(m_ImageSpacing[0]<m_ImageSpacing[1] && m_ImageSpacing[0]<m_ImageSpacing[2])
             minSpacing = m_ImageSpacing[0];
         else if (m_ImageSpacing[1] < m_ImageSpacing[2])
             minSpacing = m_ImageSpacing[1];
         else
             minSpacing = m_ImageSpacing[2];
         m_StepSize = 0.5*minSpacing;
     }
 
     m_PolyDataContainer = itk::VectorContainer< int, FiberPolyDataType >::New();
     for (int i=0; i<this->GetNumberOfThreads(); i++)
     {
         FiberPolyDataType poly = FiberPolyDataType::New();
         m_PolyDataContainer->InsertElement(i, poly);
     }
 
     if (m_MaskImage.IsNull())
     {
         itk::Vector<double, 3> spacing = inputImage->GetSpacing();
         itk::Point<double, 3> origin = inputImage->GetOrigin();
         itk::Matrix<double, 3, 3> direction = inputImage->GetDirection();
         ImageRegion<3> imageRegion = inputImage->GetLargestPossibleRegion();
 
         // initialize crossings image
         m_MaskImage = ItkUcharImgType::New();
         m_MaskImage->SetSpacing( spacing );
         m_MaskImage->SetOrigin( origin );
         m_MaskImage->SetDirection( direction );
         m_MaskImage->SetRegions( imageRegion );
         m_MaskImage->Allocate();
         m_MaskImage->FillBuffer(1);
     }
     std::cout << "StreamlineTrackingFilter: stepsize: " << m_StepSize << " mm" << std::endl;
     std::cout << "StreamlineTrackingFilter: starting streamline tracking" << std::endl;
 }
 
 template< class TTensorPixelType,
           class TPDPixelType>
 void StreamlineTrackingFilter< TTensorPixelType,
 TPDPixelType>
 ::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
                        int threadId)
 {
     FiberPolyDataType poly = m_PolyDataContainer->GetElement(threadId);
     vtkSmartPointer<vtkPoints> Points = vtkPoints::New();
     vtkSmartPointer<vtkCellArray> Cells = vtkCellArray::New();
 
     typedef itk::DiffusionTensor3D<TTensorPixelType>    TensorType;
     typedef ImageRegionConstIterator< InputImageType >  InputIteratorType;
     typedef ImageRegionConstIterator< ItkUcharImgType >  MaskIteratorType;
     typedef typename InputImageType::PixelType          InputTensorType;
     typename InputImageType::Pointer inputImage = static_cast< InputImageType * >( this->ProcessObject::GetInput(0) );
 
     InputIteratorType it(inputImage, outputRegionForThread );
     MaskIteratorType mit(m_MaskImage, outputRegionForThread );
     it.GoToBegin();
     mit.GoToBegin();
     while( !it.IsAtEnd() )
     {
         if (mit.Value()==0)
         {
             ++mit;
             ++it;
             continue;
         }
 
         typename TensorType::EigenValuesArrayType eigenvalues;
         typename TensorType::EigenVectorsMatrixType eigenvectors;
 
         for (int s=0; s<m_SeedsPerVoxel; s++)
         {
             unsigned long counter = 0;
             vtkSmartPointer<vtkPolyLine> container = vtkSmartPointer<vtkPolyLine>::New();
             std::vector< vtkIdType > pointISs;
             typename InputImageType::IndexType index = it.GetIndex();
             itk::ContinuousIndex<double, 3> pos;
             itk::ContinuousIndex<double, 3> start;
 
             if (m_SeedsPerVoxel>1)
             {
                 pos[0] = index[0]+(double)(rand()%99-49)/100;
                 pos[1] = index[1]+(double)(rand()%99-49)/100;
                 pos[2] = index[2]+(double)(rand()%99-49)/100;
             }
             else
             {
                 pos[0] = index[0];
                 pos[1] = index[1];
                 pos[2] = index[2];
             }
             start = pos;
 
             int step = 0;
             vnl_vector_fixed<double,3> dirOld; dirOld.fill(0.0);
             // do forward tracking
             while (step < m_MaxLength)
             {
                 ++step;
 
                 index[0] = RoundToNearest(pos[0]);
                 index[1] = RoundToNearest(pos[1]);
                 index[2] = RoundToNearest(pos[2]);
 
                 if (!inputImage->GetLargestPossibleRegion().IsInside(index))
                     break;
 
                 typename InputImageType::PixelType tensor = inputImage->GetPixel(index);
                 if(tensor.GetTrace()!=0 && tensor.GetFractionalAnisotropy()>m_FaThreshold)
                 {
                     tensor.ComputeEigenAnalysis(eigenvalues, eigenvectors);
-
                     vnl_vector_fixed<double,3> dir;
                     dir[0] = eigenvectors(2, 0);
                     dir[1] = eigenvectors(2, 1);
                     dir[2] = eigenvectors(2, 2);
                     dir.normalize();
 
                     if (!dirOld.is_zero())
                     {
+                        dir[0] = m_F*dir[0] + (1-m_F)*( (1-m_G)*dirOld[0] + m_G*(tensor[0]*dirOld[0] + tensor[1]*dirOld[1] + tensor[2]*dirOld[2]));
+                        dir[1] = m_F*dir[1] + (1-m_F)*( (1-m_G)*dirOld[1] + m_G*(tensor[1]*dirOld[0] + tensor[3]*dirOld[1] + tensor[4]*dirOld[2]));
+                        dir[2] = m_F*dir[2] + (1-m_F)*( (1-m_G)*dirOld[2] + m_G*(tensor[2]*dirOld[0] + tensor[4]*dirOld[1] + tensor[5]*dirOld[2]));
+                        dir.normalize();
+
                         float angle = dot_product(dirOld, dir);
                         if (angle<0)
                             dir *= -1;
                         angle = fabs(dot_product(dirOld, dir));
-                        if (angle<0.7)
+                        if (angle<m_AngularThreshold)
                             break;
                     }
+
                     dirOld = dir;
 
                     dir *= m_StepSize;
 
                     itk::Point<double> worldPos;
                     inputImage->TransformContinuousIndexToPhysicalPoint( pos, worldPos );
 
                     vtkIdType id = Points->InsertNextPoint(worldPos.GetDataPointer());
                     pointISs.push_back(id);
                     counter++;
 
                     pos[0] += dir[0]/m_ImageSpacing[0];
                     pos[1] += dir[1]/m_ImageSpacing[1];
                     pos[2] += dir[2]/m_ImageSpacing[2];
                 }
             }
 
             // insert reverse IDs
             while (!pointISs.empty())
             {
                 container->GetPointIds()->InsertNextId(pointISs.back());
                 pointISs.pop_back();
             }
 
             // do backward tracking
             index = it.GetIndex();
             pos = start;
             dirOld.fill(0.0);
             while (step < m_MaxLength)
             {
                 ++step;
 
                 index[0] = RoundToNearest(pos[0]);
                 index[1] = RoundToNearest(pos[1]);
                 index[2] = RoundToNearest(pos[2]);
 
                 if (index[0] < 0 || index[0]>=m_ImageSize[0])
                     break;
                 if (index[1] < 0 || index[1]>=m_ImageSize[1])
                     break;
                 if (index[2] < 0 || index[2]>=m_ImageSize[2])
                     break;
 
                 typename InputImageType::PixelType tensor = inputImage->GetPixel(index);
                 if(tensor.GetTrace()!=0 && tensor.GetFractionalAnisotropy()>m_FaThreshold)
                 {
                     tensor.ComputeEigenAnalysis(eigenvalues, eigenvectors);
 
                     vnl_vector_fixed<double,3> dir;
                     dir[0] = eigenvectors(2, 0);
                     dir[1] = eigenvectors(2, 1);
                     dir[2] = eigenvectors(2, 2);
                     dir.normalize();
                     dir *= -1; // reverse direction
 
                     if (!dirOld.is_zero())
                     {
                         float angle = dot_product(dirOld, dir);
                         if (angle<0)
                             dir *= -1;
                         angle = fabs(dot_product(dirOld, dir));
                         if (angle<0.7)
                             break;
                     }
                     dirOld = dir;
 
                     dir *= m_StepSize;
 
                     itk::Point<double> worldPos;
                     inputImage->TransformContinuousIndexToPhysicalPoint( pos, worldPos );
 
                     vtkIdType id = Points->InsertNextPoint(worldPos.GetDataPointer());
                     container->GetPointIds()->InsertNextId(id);
                     counter++;
 
                     pos[0] += dir[0]/m_ImageSpacing[0];
                     pos[1] += dir[1]/m_ImageSpacing[1];
                     pos[2] += dir[2]/m_ImageSpacing[2];
                 }
             }
 
             if (counter>0)
                 Cells->InsertNextCell(container);
         }
         ++mit;
         ++it;
     }
 
     poly->SetPoints(Points);
     poly->SetLines(Cells);
 
     std::cout << "Thread " << threadId << " finished tracking" << std::endl;
 }
 
 template< class TTensorPixelType,
           class TPDPixelType>
 vtkSmartPointer< vtkPolyData > StreamlineTrackingFilter< TTensorPixelType,
 TPDPixelType>
 ::AddPolyData(FiberPolyDataType poly1, FiberPolyDataType poly2)
 {
     vtkSmartPointer<vtkPolyData> vNewPolyData = vtkSmartPointer<vtkPolyData>::New();
     vtkSmartPointer<vtkCellArray> vNewLines = poly1->GetLines();
     vtkSmartPointer<vtkPoints> vNewPoints = poly1->GetPoints();
 
     vtkSmartPointer<vtkCellArray> vLines = poly2->GetLines();
     vLines->InitTraversal();
     for( int i=0; i<vLines->GetNumberOfCells(); i++ )
     {
         vtkIdType   numPoints(0);
         vtkIdType*  points(NULL);
         vLines->GetNextCell ( numPoints, points );
 
         vtkSmartPointer<vtkPolyLine> container = vtkSmartPointer<vtkPolyLine>::New();
         for( int j=0; j<numPoints; j++)
         {
             vtkIdType id = vNewPoints->InsertNextPoint(poly2->GetPoint(points[j]));
             container->GetPointIds()->InsertNextId(id);
         }
         vNewLines->InsertNextCell(container);
     }
 
     // initialize polydata
     vNewPolyData->SetPoints(vNewPoints);
     vNewPolyData->SetLines(vNewLines);
 
     return vNewPolyData;
 }
 template< class TTensorPixelType,
           class TPDPixelType>
 void StreamlineTrackingFilter< TTensorPixelType,
 TPDPixelType>
 ::AfterThreadedGenerateData()
 {
     MITK_INFO << "Generating polydata ";
     m_FiberPolyData = m_PolyDataContainer->GetElement(0);
     for (int i=1; i<this->GetNumberOfThreads(); i++)
     {
         m_FiberPolyData = AddPolyData(m_FiberPolyData, m_PolyDataContainer->GetElement(i));
     }
     MITK_INFO << "done";
 }
 
 template< class TTensorPixelType,
           class TPDPixelType>
 void StreamlineTrackingFilter< TTensorPixelType,
 TPDPixelType>
 ::PrintSelf(std::ostream& os, Indent indent) const
 {
 }
 
 }
 #endif // __itkDiffusionQballPrincipleDirectionsImageFilter_txx
diff --git a/Modules/DiffusionImaging/Tractography/itkStreamlineTrackingFilter.h b/Modules/DiffusionImaging/Tractography/itkStreamlineTrackingFilter.h
index 4d07bc4c01..dcdd0643a9 100644
--- a/Modules/DiffusionImaging/Tractography/itkStreamlineTrackingFilter.h
+++ b/Modules/DiffusionImaging/Tractography/itkStreamlineTrackingFilter.h
@@ -1,110 +1,116 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 /*===================================================================
 
 This file is based heavily on a corresponding ITK filter.
 
 ===================================================================*/
 #ifndef __itkStreamlineTrackingFilter_h_
 #define __itkStreamlineTrackingFilter_h_
 
 #include "MitkDiffusionImagingExports.h"
 #include <itkImageToImageFilter.h>
 #include <itkVectorContainer.h>
 #include <itkVectorImage.h>
 #include <itkDiffusionTensor3D.h>
 #include <vtkSmartPointer.h>
 #include <vtkPolyData.h>
 #include <vtkCellArray.h>
 #include <vtkPoints.h>
 #include <vtkPolyLine.h>
 
 namespace itk{
   /** \class StreamlineTrackingFilter
  */
 
   template< class TTensorPixelType, class TPDPixelType=double>
   class StreamlineTrackingFilter :
       public ImageToImageFilter< Image< DiffusionTensor3D<TTensorPixelType>, 3 >,
       Image< Vector< TPDPixelType, 3 >, 3 > >
   {
 
   public:
 
     typedef StreamlineTrackingFilter Self;
     typedef SmartPointer<Self>                      Pointer;
     typedef SmartPointer<const Self>                ConstPointer;
     typedef ImageToImageFilter< Image< DiffusionTensor3D<TTensorPixelType>, 3 >, Image< Vector< TPDPixelType, 3 >, 3 > > Superclass;
 
     /** Method for creation through the object factory. */
     itkNewMacro(Self)
 
     /** Runtime information support. */
     itkTypeMacro(StreamlineTrackingFilter, ImageToImageFilter)
 
     typedef TTensorPixelType                        TensorComponentType;
     typedef TPDPixelType                            DirectionPixelType;
     typedef typename Superclass::InputImageType     InputImageType;
     typedef typename Superclass::OutputImageType    OutputImageType;
     typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
     typedef itk::Image<unsigned char, 3>            ItkUcharImgType;
 
     typedef vtkSmartPointer< vtkPolyData >     FiberPolyDataType;
 
     itkGetMacro( FiberPolyData, FiberPolyDataType )
     itkSetMacro( MaskImage, ItkUcharImgType::Pointer)
     itkSetMacro( SeedsPerVoxel, int)
     itkSetMacro( FaThreshold, float)
+    itkSetMacro( AngularThreshold, float)
     itkSetMacro( StepSize, float)
+    itkSetMacro( F, float )
+    itkSetMacro( G, float )
 
   protected:
     StreamlineTrackingFilter();
     ~StreamlineTrackingFilter() {}
     void PrintSelf(std::ostream& os, Indent indent) const;
 
     double RoundToNearest(double num);
     void BeforeThreadedGenerateData();
     void ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId);
     void AfterThreadedGenerateData();
 
     FiberPolyDataType AddPolyData(FiberPolyDataType poly1, FiberPolyDataType poly2);
 
     FiberPolyDataType m_FiberPolyData;
     vtkSmartPointer<vtkPoints> m_Points;
     vtkSmartPointer<vtkCellArray> m_Cells;
     float m_FaThreshold;
+    float m_AngularThreshold;
     float m_StepSize;
     int m_MaxLength;
     int m_SeedsPerVoxel;
+    float m_F;
+    float m_G;
     std::vector< int > m_ImageSize;
     std::vector< float > m_ImageSpacing;
     ItkUcharImgType::Pointer m_MaskImage;
 
     itk::VectorContainer< int, FiberPolyDataType >::Pointer m_PolyDataContainer;
 
   private:
 
   };
 
 }
 
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "itkStreamlineTrackingFilter.cpp"
 #endif
 
 #endif //__itkStreamlineTrackingFilter_h_
 
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingView.cpp
index 06d6b9dc1a..60705ee402 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingView.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingView.cpp
@@ -1,205 +1,226 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 
 // Blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryIStructuredSelection.h>
 
 // Qmitk
 #include "QmitkStreamlineTrackingView.h"
 #include "QmitkStdMultiWidget.h"
 
 // Qt
 #include <QMessageBox>
 
 // MITK
 #include <mitkImageToItk.h>
 #include <mitkFiberBundleX.h>
 
 // VTK
 #include <vtkPolyData.h>
 #include <vtkPoints.h>
 #include <vtkCellArray.h>
 #include <vtkSmartPointer.h>
 #include <vtkPolyLine.h>
 #include <vtkCellData.h>
 
 
 const std::string QmitkStreamlineTrackingView::VIEW_ID = "org.mitk.views.streamlinetracking";
 const std::string id_DataManager = "org.mitk.views.datamanager";
 using namespace berry;
 
 QmitkStreamlineTrackingView::QmitkStreamlineTrackingView()
     : QmitkFunctionality()
     , m_Controls( 0 )
     , m_MultiWidget( NULL )
     , m_TensorImage( NULL )
     , m_SeedRoi( NULL )
 {
 }
 
 // Destructor
 QmitkStreamlineTrackingView::~QmitkStreamlineTrackingView()
 {
 
 }
 
 void QmitkStreamlineTrackingView::CreateQtPartControl( QWidget *parent )
 {
     if ( !m_Controls )
     {
         // create GUI widgets from the Qt Designer's .ui file
         m_Controls = new Ui::QmitkStreamlineTrackingViewControls;
         m_Controls->setupUi( parent );
 
         connect( m_Controls->commandLinkButton, SIGNAL(clicked()), this, SLOT(DoFiberTracking()) );
         connect( m_Controls->m_SeedsPerVoxelSlider, SIGNAL(valueChanged(int)), this, SLOT(OnSeedsPerVoxelChanged(int)) );
         connect( m_Controls->m_MinTractLengthSlider, SIGNAL(valueChanged(int)), this, SLOT(OnMinTractLengthChanged(int)) );
         connect( m_Controls->m_FaThresholdSlider, SIGNAL(valueChanged(int)), this, SLOT(OnFaThresholdChanged(int)) );
+        connect( m_Controls->m_AngularThresholdSlider, SIGNAL(valueChanged(int)), this, SLOT(OnAngularThresholdChanged(int)) );
         connect( m_Controls->m_StepsizeSlider, SIGNAL(valueChanged(int)), this, SLOT(OnStepsizeChanged(int)) );
+        connect( m_Controls->m_fSlider, SIGNAL(valueChanged(int)), this, SLOT(OnfChanged(int)) );
+        connect( m_Controls->m_gSlider, SIGNAL(valueChanged(int)), this, SLOT(OngChanged(int)) );
     }
 }
 
+void QmitkStreamlineTrackingView::OnfChanged(int value)
+{
+    m_Controls->m_fLabel->setText(QString("f: ")+QString::number((float)value/100));
+}
+
+void QmitkStreamlineTrackingView::OngChanged(int value)
+{
+    m_Controls->m_gLabel->setText(QString("g: ")+QString::number((float)value/100));
+}
+
+void QmitkStreamlineTrackingView::OnAngularThresholdChanged(int value)
+{
+    m_Controls->m_AngularThresholdLabel->setText(QString("Angular Threshold: ")+QString::number(value)+QString("°"));
+}
+
 void QmitkStreamlineTrackingView::OnSeedsPerVoxelChanged(int value)
 {
     m_Controls->m_SeedsPerVoxelLabel->setText(QString("Seeds per Voxel: ")+QString::number(value));
 }
 
 void QmitkStreamlineTrackingView::OnMinTractLengthChanged(int value)
 {
     m_Controls->m_MinTractLengthLabel->setText(QString("Min. Tract Length: ")+QString::number(value)+QString("mm"));
 }
 
 void QmitkStreamlineTrackingView::OnFaThresholdChanged(int value)
 {
     m_Controls->m_FaThresholdLabel->setText(QString("FA Threshold: ")+QString::number((float)value/100));
 }
 
 void QmitkStreamlineTrackingView::OnStepsizeChanged(int value)
 {
     if (value==0)
         m_Controls->m_StepsizeLabel->setText(QString("Stepsize: auto"));
     else
         m_Controls->m_StepsizeLabel->setText(QString("Stepsize: ")+QString::number((float)value/10)+QString("mm"));
 }
 
 void QmitkStreamlineTrackingView::StdMultiWidgetAvailable (QmitkStdMultiWidget &stdMultiWidget)
 {
     m_MultiWidget = &stdMultiWidget;
 }
 
 
 void QmitkStreamlineTrackingView::StdMultiWidgetNotAvailable()
 {
     m_MultiWidget = NULL;
 }
 
 void QmitkStreamlineTrackingView::OnSelectionChanged( std::vector<mitk::DataNode*> nodes )
 {
     m_TensorImageNode = NULL;
     m_TensorImage = NULL;
     m_SeedRoi = NULL;
     m_Controls->m_TensorImageLabel->setText("-");
     m_Controls->m_RoiImageLabel->setText("-");
 
     if(nodes.empty())
         return;
 
     for( std::vector<mitk::DataNode*>::iterator it = nodes.begin(); it != nodes.end(); ++it )
     {
         mitk::DataNode::Pointer node = *it;
 
         if( node.IsNotNull() && dynamic_cast<mitk::Image*>(node->GetData()) )
         {
             if( dynamic_cast<mitk::TensorImage*>(node->GetData()) )
             {
                 m_TensorImageNode = node;
                 m_TensorImage = dynamic_cast<mitk::TensorImage*>(node->GetData());
                 m_Controls->m_TensorImageLabel->setText(node->GetName().c_str());
             }
             else
             {
                 bool isBinary = false;
                 node->GetPropertyValue<bool>("binary", isBinary);
                 if (isBinary)
                 {
                     m_SeedRoi = dynamic_cast<mitk::Image*>(node->GetData());
                     m_Controls->m_RoiImageLabel->setText(node->GetName().c_str());
                 }
             }
         }
     }
 
     if(m_TensorImage.IsNotNull())
         m_Controls->commandLinkButton->setEnabled(true);
     else
         m_Controls->commandLinkButton->setEnabled(false);
 }
 
 
 
 void QmitkStreamlineTrackingView::DoFiberTracking()
 {
     if (m_TensorImage.IsNull())
         return;
 
     typedef itk::Image< itk::DiffusionTensor3D<float>, 3> TensorImageType;
     typedef mitk::ImageToItk<TensorImageType> CastType;
     typedef mitk::ImageToItk<ItkUCharImageType> CastType2;
 
     CastType::Pointer caster = CastType::New();
     caster->SetInput(m_TensorImage);
     caster->Update();
     TensorImageType::Pointer image = caster->GetOutput();
 
     typedef itk::StreamlineTrackingFilter< float > FilterType;
     FilterType::Pointer filter = FilterType::New();
     filter->SetInput(image);
     filter->SetSeedsPerVoxel(m_Controls->m_SeedsPerVoxelSlider->value());
     filter->SetFaThreshold((float)m_Controls->m_FaThresholdSlider->value()/100);
+    filter->SetAngularThreshold(cos((float)m_Controls->m_AngularThresholdSlider->value()*M_PI/180));
     filter->SetStepSize((float)m_Controls->m_StepsizeSlider->value()/10);
+    filter->SetF((float)m_Controls->m_fSlider->value()/100);
+    filter->SetG((float)m_Controls->m_gSlider->value()/100);
 
     if (m_SeedRoi.IsNotNull())
     {
         CastType2::Pointer caster2 = CastType2::New();
         caster2->SetInput(m_SeedRoi);
         caster2->Update();
         ItkUCharImageType::Pointer mask = caster2->GetOutput();
         filter->SetMaskImage(mask);
     }
 
     filter->Update();
 
     vtkSmartPointer<vtkPolyData> fiberBundle = filter->GetFiberPolyData();
     if ( fiberBundle->GetNumberOfLines()==0 )
         return;
     mitk::FiberBundleX::Pointer fib = mitk::FiberBundleX::New(fiberBundle);
 
     if (fib->RemoveShortFibers(m_Controls->m_MinTractLengthSlider->value()))
     {
         mitk::DataNode::Pointer node = mitk::DataNode::New();
         node->SetData(fib);
         QString name(m_TensorImageNode->GetName().c_str());
         name += "_FiberBundle";
         node->SetName(name.toStdString());
         node->SetVisibility(true);
         GetDataStorage()->Add(node);
     }
 }
 
 
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingView.h
index 582899f462..6b72a2f28f 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingView.h
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingView.h
@@ -1,88 +1,91 @@
 /*===================================================================
 
 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 QmitkStreamlineTrackingView_h
 #define QmitkStreamlineTrackingView_h
 
 #include <QmitkFunctionality.h>
 
 #include "ui_QmitkStreamlineTrackingViewControls.h"
 
 #include <mitkTensorImage.h>
 #include <mitkDataStorage.h>
 #include <mitkImage.h>
 #include <itkImage.h>
 #include <itkStreamlineTrackingFilter.h>
 
 
 /*!
 \brief QmitkStreamlineTrackingView
 
 \warning  Implements standard streamline tracking as proposed by Mori et al. 1999 "Three-Dimensional Tracking of Axonal Projections in the Brain by Magnetic Resonance Imaging"
 
 \sa QmitkFunctionality
 \ingroup Functionalities
 */
 class QmitkStreamlineTrackingView : public QmitkFunctionality
 {
   // this is needed for all Qt objects that should have a Qt meta-object
   // (everything that derives from QObject and wants to have signal/slots)
   Q_OBJECT
 
 public:
 
   static const std::string VIEW_ID;
 
   typedef itk::Image< unsigned char, 3 > ItkUCharImageType;
 
   QmitkStreamlineTrackingView();
   virtual ~QmitkStreamlineTrackingView();
 
   virtual void CreateQtPartControl(QWidget *parent);
 
   virtual void StdMultiWidgetAvailable (QmitkStdMultiWidget &stdMultiWidget);
   virtual void StdMultiWidgetNotAvailable();
 
   protected slots:
 
   void DoFiberTracking();
 
 protected:
 
   /// \brief called by QmitkFunctionality when DataManager's selection has changed
   virtual void OnSelectionChanged( std::vector<mitk::DataNode*> nodes );
   Ui::QmitkStreamlineTrackingViewControls* m_Controls;
   QmitkStdMultiWidget* m_MultiWidget;
 
 protected slots:
 
   void OnSeedsPerVoxelChanged(int value);
   void OnMinTractLengthChanged(int value);
   void OnFaThresholdChanged(int value);
+  void OnAngularThresholdChanged(int value);
+  void OnfChanged(int value);
+  void OngChanged(int value);
   void OnStepsizeChanged(int value);
 
 private:
 
   mitk::Image::Pointer          m_SeedRoi;
   mitk::TensorImage::Pointer    m_TensorImage;
   mitk::DataNode::Pointer       m_TensorImageNode;
 
 };
 
 
 
 #endif // _QMITKFIBERTRACKINGVIEW_H_INCLUDED
 
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingViewControls.ui
index 6ce35d6c92..32dd7d2226 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStreamlineTrackingViewControls.ui
@@ -1,241 +1,328 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkStreamlineTrackingViewControls</class>
  <widget class="QWidget" name="QmitkStreamlineTrackingViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>480</width>
     <height>553</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <property name="topMargin">
     <number>3</number>
    </property>
    <property name="bottomMargin">
     <number>3</number>
    </property>
    <property name="spacing">
     <number>0</number>
    </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="groupBox">
+   <item row="5" column="0">
+    <spacer name="spacer1">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>220</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0">
+    <widget class="QCommandLinkButton" name="commandLinkButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Start Tracking</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
-      <string>Data</string>
+      <string>Parameters</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="1" column="0">
+       <widget class="QLabel" name="m_AngularThresholdLabel">
+        <property name="toolTip">
+         <string>Minimum tract length in mm.</string>
+        </property>
         <property name="text">
-         <string>Tensor Image:</string>
+         <string>Angular Threshold: 45°</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="m_TensorImageLabel">
+      <item row="4" column="0">
+       <widget class="QLabel" name="m_StepsizeLabel">
+        <property name="toolTip">
+         <string>Minimum tract length in mm.</string>
+        </property>
         <property name="text">
-         <string>-</string>
+         <string>Step Size: auto</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_6">
+      <item row="2" column="0">
+       <widget class="QLabel" name="m_fLabel">
+        <property name="toolTip">
+         <string>Minimum tract length in mm.</string>
+        </property>
         <property name="text">
-         <string>Seed ROI Image:</string>
+         <string>f: 1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1">
+       <widget class="QSlider" name="m_SeedsPerVoxelSlider">
+        <property name="toolTip">
+         <string>Number of tracts started in each voxel of the seed ROI.</string>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>10</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QLabel" name="m_RoiImageLabel">
+       <widget class="QSlider" name="m_AngularThresholdSlider">
+        <property name="toolTip">
+         <string>Fractional Anisotropy Threshold</string>
+        </property>
+        <property name="minimum">
+         <number>0</number>
+        </property>
+        <property name="maximum">
+         <number>180</number>
+        </property>
+        <property name="value">
+         <number>45</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QSlider" name="m_MinTractLengthSlider">
+        <property name="toolTip">
+         <string>Minimum tract length in mm.</string>
+        </property>
+        <property name="minimum">
+         <number>0</number>
+        </property>
+        <property name="maximum">
+         <number>500</number>
+        </property>
+        <property name="value">
+         <number>40</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="m_SeedsPerVoxelLabel">
+        <property name="toolTip">
+         <string>Number of tracts started in each voxel of the seed ROI.</string>
+        </property>
         <property name="text">
-         <string>-</string>
+         <string>Seeds per Voxel: 1</string>
         </property>
        </widget>
       </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Parameters</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="4" column="0">
+      <item row="7" column="0">
        <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType">
          <enum>QSizePolicy::Fixed</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>200</width>
           <height>0</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="m_SeedsPerVoxelLabel">
-        <property name="toolTip">
-         <string>Number of tracts started in each voxel of the seed ROI.</string>
-        </property>
-        <property name="text">
-         <string>Seeds per Voxel: 1</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QSlider" name="m_MinTractLengthSlider">
+      <item row="0" column="1">
+       <widget class="QSlider" name="m_FaThresholdSlider">
         <property name="toolTip">
-         <string>Minimum tract length in mm.</string>
+         <string>Fractional Anisotropy Threshold</string>
         </property>
         <property name="minimum">
          <number>0</number>
         </property>
         <property name="maximum">
-         <number>500</number>
+         <number>100</number>
         </property>
         <property name="value">
-         <number>40</number>
+         <number>20</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="QSlider" name="m_SeedsPerVoxelSlider">
+      <item row="2" column="1">
+       <widget class="QSlider" name="m_fSlider">
         <property name="toolTip">
-         <string>Number of tracts started in each voxel of the seed ROI.</string>
+         <string>Weighting factor between first eigenvector (f=1) and input vector dependent direction (f=0).</string>
         </property>
         <property name="minimum">
-         <number>1</number>
+         <number>0</number>
         </property>
         <property name="maximum">
-         <number>10</number>
+         <number>100</number>
+        </property>
+        <property name="value">
+         <number>100</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="m_MinTractLengthLabel">
+      <item row="0" column="0">
+       <widget class="QLabel" name="m_FaThresholdLabel">
         <property name="toolTip">
          <string>Minimum tract length in mm.</string>
         </property>
         <property name="text">
-         <string>Min. Tract Length: 40mm</string>
+         <string>FA Threshold: 0.2</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="m_FaThresholdLabel">
+      <item row="5" column="0">
+       <widget class="QLabel" name="m_MinTractLengthLabel">
         <property name="toolTip">
          <string>Minimum tract length in mm.</string>
         </property>
         <property name="text">
-         <string>FA Threshold: 0.2</string>
+         <string>Min. Tract Length: 40mm</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QSlider" name="m_FaThresholdSlider">
+      <item row="4" column="1">
+       <widget class="QSlider" name="m_StepsizeSlider">
         <property name="toolTip">
-         <string>Fractional Anisotropy Threshold</string>
+         <string>Stepsize in mm (auto = 0.5*minimal spacing)</string>
         </property>
         <property name="minimum">
          <number>0</number>
         </property>
         <property name="maximum">
          <number>100</number>
         </property>
         <property name="value">
-         <number>20</number>
+         <number>0</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="m_StepsizeLabel">
+      <item row="3" column="0">
+       <widget class="QLabel" name="m_gLabel">
         <property name="toolTip">
          <string>Minimum tract length in mm.</string>
         </property>
         <property name="text">
-         <string>Step Size: auto</string>
+         <string>g: 1</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QSlider" name="m_StepsizeSlider">
+      <item row="3" column="1">
+       <widget class="QSlider" name="m_gSlider">
         <property name="toolTip">
-         <string>Stepsize in mm (auto = 0.5*minimal spacing)</string>
+         <string>Weighting factor between input vector (g=0) and tensor deflection (g=1)</string>
         </property>
         <property name="minimum">
          <number>0</number>
         </property>
         <property name="maximum">
          <number>100</number>
         </property>
         <property name="value">
          <number>0</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="4" column="0">
-    <widget class="QCommandLinkButton" name="commandLinkButton">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Start Tracking</string>
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Data</string>
      </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Tensor Image:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="m_TensorImageLabel">
+        <property name="text">
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Seed ROI Image:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLabel" name="m_RoiImageLabel">
+        <property name="text">
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="5" column="0">
-    <spacer name="spacer1">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>220</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>
   <tabstop>commandLinkButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>